Finish Hotfix-mo-120

src/components/Common/print-common.vue

@@ -8,7 +8,7 @@
         <el-row :gutter="0">
           <el-col :span="12" class="item">
             <div class="label">经销商编码：</div>
-            <div class="value">{{ item.customerId }}</div>
+            <div class="value">{{ item.customerNumber }}</div>
           </el-col>
           <el-col :span="12" class="item">
             <div class="label">打印日期：</div>
@@ -63,7 +63,7 @@
       <div class="print-form-2">
         <el-row :gutter="30">
           <el-col :span="8" class="item">
-            <div class="label">退货人</div>
+            <div class="label">{{ item.type === 2 ? '退货人':'提货人' }}</div>
             <div class="value">
               <el-input value=""></el-input>
             </div>

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

@@ -77,27 +77,30 @@
     <div class="table" style="margin-top: 20px">
       <el-table :data="goodsList" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400">
         <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
-        <el-table-column align="center" label="引用单号" prop="orderId" min-width="180" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="发货数量" prop="refundableQty" min-width="80" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="申请数量" prop="invoiceNum" min-width="110" show-overflow-tooltip>
+        <el-table-column align="left" label="引用单号" prop="orderId" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="left" label="销售出库单号" prop="id" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="left" label="发货申请单号" prop="orderNo" min-width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column align="left" label="订单号" prop="mainOrderId" min-width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="left" label="规格型号" prop="specification" min-width="350" 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="invoiceNum" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.invoiceNum" size="small" type="number"></el-input>
           </template>
         </el-table-column>
-        <!-- <el-table-column align="center" label="仓库" prop="correspondId" min-width="140" show-overflow-tooltip>
+        <!-- <el-table-column align="left" label="仓库" prop="correspondId" min-width="140" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-select v-model="scope.row.correspondId" placeholder="请选择仓库" size="small" filterable clearable style="width: 100%">
               <el-option :label="item.name" :value="item.id" v-for="(item, index) in warehouseList" :key="index"></el-option>
             </el-select>
           </template>
         </el-table-column> -->
-        <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip>
+        <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.remark" size="small"></el-input>
           </template>
@@ -121,11 +124,11 @@
     </div>
 
     <el-dialog title="添加引用" :visible.sync="isShowDialog" width="80%">
-      <el-form ref="screenForm" :model="screenForm" size="small" label-position="left" label-width="100px">
+      <el-form ref="screenForm" :model="screenForm" size="mini" label-position="left" label-width="100px">
         <el-row :gutter="20">
           <el-col :xs="12" :sm="6" :lg="6">
             <el-form-item prop="warehouse" label="选择仓库">
-              <el-select v-model="screenForm.warehouse" placeholder="请选择仓库" size="small" filterable clearable :disabled="goodsList.length > 0" style="width: 100%">
+              <el-select v-model="screenForm.warehouse" placeholder="请选择仓库" filterable clearable :disabled="goodsList.length > 0" style="width: 100%">
                 <el-option :label="item.name" :value="item.id" v-for="(item, index) in warehouseList" :key="index"></el-option>
               </el-select>
             </el-form-item>
@@ -137,37 +140,40 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <!-- <el-col :xs="12" :sm="6" :lg="6">
-            <el-form-item prop="type" label="产品大类">
-              <el-select v-model="screenForm.type" placeholder="选择产品大类" style="width: 100%" :disabled="goodsList.length > 0 || tableSelection.length > 0">
-                <el-option v-for="item in typeList" :key="item.dictCode" :label="item.dictValue" :value="item.dictCode"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
           <el-col :xs="12" :sm="6" :lg="6">
             <el-form-item prop="orderNum" label="销售出库单号">
               <el-input v-model="screenForm.orderNum" placeholder="请输入销售出库单号"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="6" :lg="6">
-            <el-form-item prop="orderNo" label="发货单号">
-              <el-input v-model="screenForm.orderNo" placeholder="请输入发货单号"></el-input>
+            <el-form-item prop="orderNo" label="发货申请单号">
+              <el-input v-model="screenForm.orderNo" placeholder="请输入发货申请单号"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="6" :lg="6">
-            <el-form-item label="规格型号" prop="model">
-              <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
+            <el-form-item prop="mainOrderId" label="订单号">
+              <el-input v-model="screenForm.mainOrderId" placeholder="请输入订单号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="12" :sm="6" :lg="6">
+            <el-form-item prop="dealer" label="经销商名称">
+              <el-input v-model="screenForm.dealer" placeholder="请输入经销商名称"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="6" :lg="6">
-            <el-form-item label="产品名称" prop="goodsName">
+            <el-form-item prop="goodsName" label="产品名称">
               <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :xs="12" :sm="12" :lg="12" class="tr">
+          <el-col :xs="12" :sm="6" :lg="6">
+            <el-form-item label="规格型号" prop="model">
+              <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="24" :lg="24" class="tr">
             <el-form-item label="">
-              <el-button size="small" @click="resetScreenForm">清空</el-button>
-              <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+              <el-button @click="resetScreenForm">清空</el-button>
+              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -175,16 +181,18 @@
 
       <div class="table">
         <el-table :data="tableGoodsList" element-loading-text="Loading" border fit highlight-current-row stripe height="400">
-          <el-table-column align="center" label="销售出库单号" prop="id" min-width="120" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
-          <!-- <el-table-column align="center" label="存货类别" prop="categoryName" min-width="100" show-overflow-tooltip></el-table-column> -->
-          <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="单位" prop="unit" min-width="80" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="发货数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="申请数量" prop="invoiceNum" min-width="110" show-overflow-tooltip>
+          <el-table-column align="left" label="销售出库单号" prop="id" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="发货申请单号" prop="orderNo" min-width="120" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="订单号" prop="mainOrderId" min-width="120" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="经销商" prop="customerName" min-width="250" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="单位" prop="unit" min-width="80" 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="invoiceNum" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input v-model="scope.row.invoiceNum" size="small" type="number" :disabled="scope.row.selected"></el-input>
+              <el-input v-model="scope.row.invoiceNum" size="mini" type="number" :disabled="scope.row.selected"></el-input>
             </template>
           </el-table-column>
         </el-table>
@@ -214,7 +222,6 @@
 <script>
 import { getApplyDetail, addApplyReturn, editApply, getSalesGoodsList, getWarehouseList, getDealerList } from "@/api/supply/apply";
 import { getDictList, getCategoryList } from '@/api/common'
-import { findElem } from '@/utils/util'
 import fileUpload from '@/components/Common/file-upload.vue'
 
 export default {
@@ -249,6 +256,8 @@ export default {
         type: '',
         orderNum: '',
         orderNo: '',
+        mainOrderId: '',
+        dealer: '',
         model: '',
         goodsName: '',
       },
@@ -385,6 +394,8 @@ export default {
         categoryName: this.screenForm.type,
         id: this.screenForm.orderNum,
         orderNo: this.screenForm.orderNo,
+        mainOrderId: this.screenForm.mainOrderId,
+        customerName: this.screenForm.dealer,
         specification: this.screenForm.model,
         materialName: this.screenForm.goodsName,
         saleType: 1, // 1零售，2工程
@@ -447,8 +458,8 @@ export default {
     resetScreenForm() {
       this.$refs.screenForm.resetFields();
       this.currentPage = 1;
-      this.tableGoodsList = [];
-      // this.getSalesGoodsList();
+      // this.tableGoodsList = [];
+      this.getSalesGoodsList();
     },
 
     // 更改列表当前页

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

@@ -184,9 +184,23 @@
     </div>
 
     <el-dialog title="添加引用" :visible.sync="isShowDialog" width="80%">
-      <el-form ref="screenForm" :model="screenForm" size="small" label-position="left" label-width="100px">
+      <el-form ref="screenForm" :model="screenForm" size="mini" label-position="left" label-width="100px">
         <el-row :gutter="20">
           <el-col :xs="12" :sm="12" :lg="6">
+            <el-form-item prop="warehouse" label="选择仓库">
+              <el-select v-model="screenForm.warehouse" placeholder="请选择仓库" filterable clearable :disabled="goodsList.length > 0 || tableSelection.length > 0" style="width: 100%">
+                <el-option :label="item.name" :value="item.id" v-for="(item, index) in warehouseList" :key="index"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="12" :sm="12" :lg="6">
+            <el-form-item prop="type" label="存货类别">
+              <el-select v-model="screenForm.type" placeholder="选择存货类别" style="width: 100%" :disabled="goodsList.length > 0">
+                <el-option v-for="item in categoryList" :key="item.name" :label="item.name" :value="item.name"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="12" :sm="12" :lg="6">
             <el-form-item prop="loginNum" label="工程登录编号">
               <el-input v-model="screenForm.loginNum" placeholder="请输入工程登录编号"></el-input>
             </el-form-item>
@@ -197,43 +211,39 @@
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="12" :lg="6">
-            <el-form-item prop="model" label="规格型号">
-              <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :xs="12" :sm="12" :lg="6">
             <el-form-item prop="orderNum" label="销售出库单号">
               <el-input v-model="screenForm.orderNum" placeholder="请输入销售出库单号"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="12" :lg="6">
-            <el-form-item prop="orderNo" label="发货单号">
-              <el-input v-model="screenForm.orderNo" placeholder="请输入发货单号"></el-input>
+            <el-form-item prop="orderNo" label="发货申请单号">
+              <el-input v-model="screenForm.orderNo" placeholder="请输入发货申请单号"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="12" :lg="6">
-            <el-form-item prop="warehouse" label="选择仓库">
-              <el-select v-model="screenForm.warehouse" placeholder="请选择仓库" size="small" filterable clearable :disabled="goodsList.length > 0 || tableSelection.length > 0" style="width: 100%">
-                <el-option :label="item.name" :value="item.id" v-for="(item, index) in warehouseList" :key="index"></el-option>
-              </el-select>
+            <el-form-item prop="mainOrderId" label="订单号">
+              <el-input v-model="screenForm.mainOrderId" placeholder="请输入订单号"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="12" :lg="6">
-            <el-form-item prop="type" label="存货类别">
-              <el-select v-model="screenForm.type" placeholder="选择存货类别" style="width: 100%" :disabled="goodsList.length > 0">
-                <el-option v-for="item in categoryList" :key="item.name" :label="item.name" :value="item.name"></el-option>
-              </el-select>
+            <el-form-item prop="dealer" label="经销商名称">
+              <el-input v-model="screenForm.dealer" placeholder="请输入经销商名称"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="12" :lg="6">
-            <el-form-item label="产品名称" prop="goodsName">
+            <el-form-item prop="goodsName" label="产品名称">
               <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="24" :lg="24" class="tr">
+          <el-col :xs="12" :sm="12" :lg="6">
+            <el-form-item prop="model" label="规格型号">
+              <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12" class="tr">
             <el-form-item label="">
-              <el-button size="small" @click="resetScreenForm">清空</el-button>
-              <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+              <el-button @click="resetScreenForm">清空</el-button>
+              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -242,34 +252,36 @@
       <div class="table">
         <el-table :data="tableGoodsList" element-loading-text="Loading" border fit highlight-current-row stripe height="400" @selection-change="tableSelectionChange">
           <el-table-column align="center" type="selection" width="55" :selectable='checkboxSelect'></el-table-column>
-          <el-table-column align="center" label="订单类型" prop="orderType" min-width="180" show-overflow-tooltip>
+          <el-table-column align="left" label="订单类型" prop="orderType" min-width="120" show-overflow-tooltip>
             <template slot-scope="scope">
               {{scope.row.orderType | orderTypeFilter}}
             </template>
           </el-table-column>
-          <el-table-column align="center" label="销售出库单号" prop="id" min-width="200" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="工程登录编号" prop="refEnginRecordNo" min-width="200" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="单位" prop="unit" min-width="80" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="订单数量" prop="qty" min-width="80" show-overflow-tooltip></el-table-column>
-          <!-- <el-table-column align="center" label="已申请数量" prop="alreadyInvoiceNum" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="已申请未出货数量" prop="sendQty" min-width="100" show-overflow-tooltip></el-table-column> -->
-          <el-table-column align="center" label="未申请数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="本次申请数量" prop="invoiceNum" min-width="110" show-overflow-tooltip>
+          <el-table-column align="left" label="工程登录编号" prop="refEnginRecordNo" min-width="140" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="销售出库单号" prop="id" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="发货申请单号" prop="orderNo" min-width="120" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="订单号" prop="mainOrderId" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="单位" prop="unit" min-width="80" show-overflow-tooltip></el-table-column>
+          <el-table-column align="right" label="订单数量" prop="qty" min-width="80" show-overflow-tooltip></el-table-column>
+          <!-- <el-table-column align="right" label="已申请数量" prop="alreadyInvoiceNum" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="right" label="已申请未出货数量" prop="sendQty" 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="invoiceNum" min-width="110" show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-input v-model="scope.row.invoiceNum" size="small" type="number"></el-input>
+              <el-input v-model="scope.row.invoiceNum" size="mini" type="number"></el-input>
             </template>
           </el-table-column>
-          <!-- <el-table-column align="center" label="总库存数量" prop="stockAdequate" min-width="100" show-overflow-tooltip>
+          <!-- <el-table-column align="right" label="总库存数量" prop="stockAdequate" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               {{stockFilter(scope.row, 1)}}
             </template>
           </el-table-column> -->
-          <!-- <el-table-column align="center" label="对应库存数量" prop="stockCorrespond" min-width="110" show-overflow-tooltip>
+          <!-- <el-table-column align="right" label="对应库存数量" prop="stockCorrespond" min-width="110" show-overflow-tooltip>
             <template slot-scope="scope">
               {{stockFilter(scope.row, 2)}}
             </template>
@@ -369,6 +381,8 @@ export default {
         warehouse: '',
         type: '',
         goodsName: '',
+        mainOrderId: '',
+        dealer: '',
       },
       currentPage: 1,
       listTotal: 0,
@@ -547,6 +561,8 @@ export default {
         id: this.screenForm.orderNum,
         orderNo: this.screenForm.orderNo,
         materialName: this.screenForm.goodsName,
+        mainOrderId: this.screenForm.mainOrderId,
+        customerName: this.screenForm.dealer,
         saleType: 2, // 1零售，2工程
       }).then(res => {
         let oldGoodsList = this.goodsList;
@@ -601,7 +617,7 @@ export default {
       this.$refs.screenForm.resetFields();
       this.currentPage = 1;
       // this.tableGoodsList = [];
-      // this.getGoodsList();
+      this.getGoodsList();
     },
 
     // 更改列表当前页

src/views/supply/sales/components/sales_return_form.vue

@@ -68,27 +68,27 @@
     <div class="table" style="margin-top: 20px">
       <el-table :data="goodsList" element-loading-text="Loading" border fit highlight-current-row stripe max-height="400">
         <el-table-column align="center" label="序号" type="index" width="50"></el-table-column>
-        <el-table-column align="center" label="销售出库单" prop="id" min-width="180" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="可退数量" prop="refundableQty" min-width="80" show-overflow-tooltip></el-table-column>
-        <el-table-column align="center" label="申请数量" prop="invoiceNum" min-width="110" show-overflow-tooltip>
+        <el-table-column align="left" label="销售出库单" prop="id" min-width="180" show-overflow-tooltip></el-table-column>
+        <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="120" show-overflow-tooltip></el-table-column>
+        <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
+        <el-table-column align="left" label="规格型号" prop="specification" min-width="350" 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="80" show-overflow-tooltip></el-table-column>
+        <el-table-column align="right" label="申请数量" prop="invoiceNum" min-width="110" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.invoiceNum" size="small" type="number"></el-input>
+            <el-input v-model="scope.row.invoiceNum" size="mini" type="number"></el-input>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="仓库" prop="correspondId" min-width="140" show-overflow-tooltip>
+        <el-table-column align="left" label="仓库" prop="correspondId" min-width="140" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-select v-model="scope.row.correspondId" placeholder="请选择仓库" size="small" filterable clearable style="width: 100%">
+            <el-select v-model="scope.row.correspondId" placeholder="请选择仓库" size="mini" filterable clearable style="width: 100%">
               <el-option :label="item.name" :value="item.id" v-for="(item, index) in warehouseList" :key="index"></el-option>
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip>
+        <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.remark" size="small"></el-input>
           </template>
@@ -112,23 +112,40 @@
     </div>
 
     <el-dialog title="添加产品" :visible.sync="isShowDialog" width="80%">
-      <el-form ref="screenForm" :model="screenForm" size="small" label-position="left" label-width="90px">
+      <el-form ref="screenForm" :model="screenForm" size="mini" label-position="left" label-width="100px">
         <el-row :gutter="20">
           <el-col :xs="12" :sm="6" :lg="6">
             <el-form-item prop="warehouse" label="选择仓库">
-              <el-select v-model="screenForm.warehouse" placeholder="请选择仓库" size="small" filterable clearable style="width: 100%">
+              <el-select v-model="screenForm.warehouse" placeholder="请选择仓库" filterable clearable style="width: 100%">
                 <el-option :label="item.name" :value="item.id" v-for="(item, index) in warehouseList" :key="index"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="6" :lg="6">
-            <el-form-item prop="orderNum" label="销售出库单">
-              <el-input v-model="screenForm.orderNum" placeholder="请输入销售出库单"></el-input>
+            <el-form-item prop="type" label="存货类别">
+              <el-select v-model="screenForm.type" placeholder="选择存货类别" style="width: 100%" clearable>
+                <el-option v-for="item in categoryList" :key="item.name" :label="item.name" :value="item.name"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="12" :sm="6" :lg="6">
+            <el-form-item prop="orderNum" label="销售出库单号">
+              <el-input v-model="screenForm.orderNum" placeholder="请输入销售出库单号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="12" :sm="6" :lg="6">
+            <el-form-item prop="orderNo" label="发货申请单号">
+              <el-input v-model="screenForm.orderNo" placeholder="请输入发货申请单号"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="12" :sm="6" :lg="6">
+            <el-form-item prop="mainOrderId" label="订单号">
+              <el-input v-model="screenForm.mainOrderId" placeholder="请输入订单号"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="6" :lg="6">
-            <el-form-item prop="dealer" label="经销商">
-              <el-input v-model="screenForm.dealer" placeholder="请输入经销商"></el-input>
+            <el-form-item prop="dealer" label="经销商名称">
+              <el-input v-model="screenForm.dealer" placeholder="请输入经销商名称"></el-input>
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="6" :lg="6">
@@ -137,14 +154,14 @@
             </el-form-item>
           </el-col>
           <el-col :xs="12" :sm="6" :lg="6">
-            <el-form-item label="规格型号" prop="model">
+            <el-form-item prop="model" label="规格型号">
               <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :xs="12" :sm="18" :lg="18" class="tr">
+          <el-col :xs="24" :sm="24" :lg="24" class="tr">
             <el-form-item label="">
-              <el-button size="small" @click="resetScreenForm">清空</el-button>
-              <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+              <el-button @click="resetScreenForm">清空</el-button>
+              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -153,11 +170,13 @@
       <div class="table">
         <el-table :data="tableGoodsList" element-loading-text="Loading" border fit highlight-current-row stripe height="400" @selection-change="tableSelectionChange">
           <el-table-column align="center" type="selection" width="55" :selectable='checkboxSelect'></el-table-column>
-          <el-table-column align="center" label="销售出库单" prop="id" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="经销商" prop="customerName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="仓库" prop="correspondName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="销售出库单" prop="id" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="发货申请单号" prop="orderNo" min-width="120" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="订单号" prop="mainOrderId" min-width="120" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="经销商" prop="customerName" min-width="250" show-overflow-tooltip></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="materialName" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip></el-table-column>
         </el-table>
         <div class="pagination clearfix" style="margin-top: 10px">
           <div class="fr">
@@ -185,7 +204,6 @@
 <script>
 import { addReturn, getSalesGoodsList, getWarehouseList, getDealerList } from "@/api/supply/sales";
 import { getDictList, getCategoryList } from '@/api/common'
-import { findElem } from '@/utils/util'
 import fileUpload from '@/components/Common/file-upload.vue'
 
 export default {
@@ -216,7 +234,10 @@ export default {
       isShowDialog: false,
       screenForm: {
         warehouse: '',
+        type: '',
         orderNum: '',
+        orderNo: '',
+        mainOrderId: '',
         dealer: '',
         goodsName: '',
         model: '',
@@ -332,7 +353,10 @@ export default {
         pageNum: this.currentPage,
         pageSize: 10,
         correspondId: this.screenForm.warehouse,
-        orderNo: this.screenForm.orderNum,
+        categoryName: this.screenForm.type,
+        id: this.screenForm.orderNum,
+        orderNo: this.screenForm.orderNo,
+        mainOrderId: this.screenForm.mainOrderId,
         customerName: this.screenForm.dealer,
         materialName: this.screenForm.goodsName,
         specification: this.screenForm.model,

src/views/supply/sales/sales_list.vue

@@ -116,12 +116,18 @@
                 <span>{{scope.row.id}}</span>
               </template>
             </el-table-column>
-            <el-table-column align="left" label="发货单号" prop="orderNo" min-width="120" show-overflow-tooltip>
+            <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.mainOrderId" />
+                <span>{{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">