【修改】

1.发货单汇总表
2.工程信息单

src/views/supply/apply/apply_list.vue

@@ -196,18 +196,20 @@
                 <span>{{scope.row.specification}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="产品类别" prop="categoryName" min-width="350" show-overflow-tooltip>
+            <el-table-column align="left" label="产品类别" prop="categoryName" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 <span>{{scope.row.categoryName}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="销售政策名称" prop="policyTitle" min-width="350" show-overflow-tooltip>
+            <el-table-column align="left" label="销售政策名称" prop="policyTitle" min-width="100" show-overflow-tooltip>
 
             </el-table-column>
-               <el-table-column align="left" label="文件编号" prop="itemFileNo" min-width="350" show-overflow-tooltip>
+               <el-table-column align="left" label="文件编号" prop="itemFileNo" min-width="100" show-overflow-tooltip>
 
             </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="retiredQty" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="含税单价" prop="singlePayPrice" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.singlePayPrice | numToFixed}}
@@ -228,8 +230,6 @@
                 {{scope.row.totalDiscAmount | numToFixed}}
               </template>
             </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="retiredQty" 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="invoiceRemark" min-width="160" show-overflow-tooltip></el-table-column>

src/views/supply/apply/engin_list.vue

@@ -217,15 +217,15 @@
                 <span>{{scope.row.specification}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="产品类别" prop="categoryName" min-width="350" show-overflow-tooltip>
+            <el-table-column align="left" label="产品类别" prop="categoryName" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 <span>{{scope.row.categoryName}}</span>
               </template>
             </el-table-column>
             <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="文件编号" prop="itemFileNo" min-width="200" show-overflow-tooltip>
-            </el-table-column>
-          <el-table-column align="right" label="含税单价" prop="singlePayPrice" min-width="100" show-overflow-tooltip>
+            <el-table-column align="left" label="文件编号" prop="itemFileNo" 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="singlePayPrice" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.singlePayPrice | numToFixed}}
               </template>
@@ -245,7 +245,6 @@
                 {{scope.row.totalDiscAmount | numToFixed}}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="数量" prop="refundableQty" 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="invoiceRemark" min-width="160" show-overflow-tooltip></el-table-column>

src/views/supply/deliver/commerce_list.vue

@@ -184,6 +184,7 @@
               </template>
             </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="singlePayPrice" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.singlePayPrice | numToFixed}}
@@ -204,7 +205,6 @@
                 {{scope.row.totalDiscAmount | numToFixed}}
               </template>
             </el-table-column>
-            <el-table-column align="right" label="数量" prop="refundableQty" 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="invoiceRemark" min-width="160" show-overflow-tooltip></el-table-column>

src/views/supply/deliver/deliver_list.vue

@@ -148,12 +148,14 @@
                 <span>{{scope.row.specification}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="产品类别" prop="categoryName" min-width="350" show-overflow-tooltip>
+            <el-table-column align="left" label="产品类别" prop="categoryName" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 <span>{{scope.row.categoryName}}</span>
               </template>
             </el-table-column>
-            <!-- <el-table-column align="left" label="文件编号" prop="itemFileNo" min-width="350" show-overflow-tooltip/> -->
+            <!-- <el-table-column align="left" label="文件编号" prop="itemFileNo" min-width="100" show-overflow-tooltip/> -->
+            <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="未出库数量" prop="notOutNumber" min-width="100" show-overflow-tooltip></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}}
@@ -169,8 +171,6 @@
                 {{scope.row.afterTaxPrice | numToFixed}}
               </template>
             </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="notOutNumber" 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="invoiceRemark" min-width="160" show-overflow-tooltip></el-table-column>

src/views/supply/deliver/home_list.vue

@@ -163,6 +163,8 @@
               </template>
             </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="notOutNumber" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="含税单价" prop="singlePayPrice" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.singlePayPrice | numToFixed}}
@@ -183,8 +185,6 @@
                 {{scope.row.totalDiscAmount | numToFixed}}
               </template>
             </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="notOutNumber" 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="invoiceRemark" min-width="160" show-overflow-tooltip></el-table-column>

src/views/supply/deliver/sum_list.vue

@@ -129,7 +129,7 @@
         <div class="table">
           <el-table ref="table" v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit
             highlight-current-row stripe @select="handleSelect" @select-all="handleSelectAll" show-summary
-            :summary-method="$getSummaries">
+            :summary-method="$getSummaries" max-height="500">
             <el-table-column align="center" type="selection" width="55"></el-table-column>
             <el-table-column align="right" label="打印次数" prop="printNum" min-width="80" show-overflow-tooltip>
             </el-table-column>
@@ -151,7 +151,7 @@
                 <span>{{ scope.row.id }}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="订单号" prop="orderId" min-width="130" show-overflow-tooltip>
+            <el-table-column align="left" label="订单号" prop="orderId" min-width="140" show-overflow-tooltip>
               <template slot-scope="scope">
 
                 <CopyButton
@@ -205,6 +205,8 @@
             <el-table-column align="left" label="仓库" prop="correspondName" 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="payAmount" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.payAmount | numToFixed }}
@@ -225,8 +227,6 @@
                 {{ (scope.row.totalDiscAmount + scope.row.payRebateAmount) | numToFixed }}
               </template>
             </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="singlePayPrice" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">

src/views/supply/engin/components/commerce_form.vue

@@ -714,6 +714,10 @@ export default {
         this.mainForm.geLiInerNote = data.geLiInerNote;
         this.mainForm.geLiNote = data.geLiNote;
         this.mainForm.fileNo = data.fileNo;
+        if(!this.isDealer) {
+          this.mainForm.jxsNum = data.customerNumber;
+          this.mainForm.jxsName = data.customerName;
+        }
 
         this.goodsList = data.items.map(item => {
           return {

src/views/supply/engin/engin_list.vue

@@ -172,20 +172,20 @@
               </template>
             </el-table-column>
             <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="单价" prop="price" min-width="100" show-overflow-tooltip>
+            <el-table-column align="right" label="数量" prop="qty" min-width="100" sortable 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="qty" min-width="100" sortable show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="金额" prop="totalAmount" min-width="100" sortable show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.totalAmount | numToFixed}}
               </template>
             </el-table-column>
-            <el-table-column align="left" label="已订数量" prop="hasOrderQty" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="可订数量" min-width="100" show-overflow-tooltip>
+            <el-table-column align="right" label="已订数量" prop="hasOrderQty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="可订数量" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ computeAllowQty(scope.row.qty, scope.row.hasOrderQty)}}
               </template>

src/views/supply/implement/implement_list.vue

@@ -182,7 +182,7 @@
              <el-table-column align="left" label="直调状态" prop="directTransferStatusName" min-width="100" show-overflow-tooltip>
              </el-table-column>
 
-            <el-table-column align="left" label="钱包" prop="walletName" min-width="250" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="钱包" prop="walletName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="订单未发货数量" prop="refundableQty" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="总数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="退订数量" prop="retiredQty" min-width="100" show-overflow-tooltip></el-table-column>

src/views/supply/implement/implement_total_list.vue

@@ -181,7 +181,7 @@
             </el-table-column>
             <el-table-column align="left" label="直调状态" prop="directTransferStatusName" min-width="100" show-overflow-tooltip>
              </el-table-column>
-            <el-table-column align="left" label="钱包" prop="walletName" min-width="250" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="钱包" prop="walletName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="订单未发货数量" prop="refundableQty" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="总数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="退订数量" prop="retiredQty" min-width="100" show-overflow-tooltip></el-table-column>