【修改】bug

src/views/supply/deliver/sum_list.vue

@@ -10,209 +10,288 @@
           </template>
 
           <template #search>
-            <el-form ref="screenForm" :model="screenForm" label-width="120px" size="mini" label-position="left">
-              <el-row :gutter="20">
-                <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="产品名称" prop="goodsName">
-                    <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称" />
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="物料编码" prop="goodsCode">
-                    <el-input v-model="screenForm.goodsCode" placeholder="请输入物料编码" />
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="产品编码" prop="goodsOldCode">
-                    <el-input v-model="screenForm.goodsOldCode" placeholder="请输入产品编码" />
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="规格型号" prop="model">
-                    <el-input v-model="screenForm.model" placeholder="请输入规格型号" />
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="制单日期" prop="createDate">
-                    <el-date-picker
-                      v-model="screenForm.createDate"
-                      type="datetimerange"
-                      range-separator="至"
-                      style="width: 100%"
-                      value-format="yyyy-MM-dd HH:mm:ss"
-                      start-placeholder="开始日期"
-                      end-placeholder="结束日期"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="发货日期" prop="deliverDate">
-                    <el-date-picker
-                      v-model="screenForm.deliverDate"
-                      type="datetimerange"
-                      range-separator="至"
-                      style="width: 100%"
-                      value-format="yyyy-MM-dd HH:mm:ss"
-                      start-placeholder="开始日期"
-                      end-placeholder="结束日期"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="经销商编号" prop="jxsNum">
-                    <el-input v-model="screenForm.jxsNum" placeholder="请输入经销商编号" />
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="经销商名称" prop="jxsName">
-                    <el-input v-model="screenForm.jxsName" placeholder="请输入经销商名称" />
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="发货单号" prop="orderNum">
-                    <el-input v-model="screenForm.orderNum" placeholder="请输入发货单号" />
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="订单" prop="mainOrderId">
-                    <el-input v-model="screenForm.mainOrderId" placeholder="请输入订单" />
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="存货类别" prop="type">
-                    <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-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="仓库" prop="correspondId">
-                    <el-select
-                      v-model="screenForm.correspondId"
-                      multiple
-                      style="width: 100%"
-                      placeholder="请选择仓库"
-                      size="mini"
-                      filterable
-                      clearable
-                    >
-                      <el-option
-                        v-for="(item, index) in warehouseList"
-                        :key="index"
-                        :label="item.name"
-                        :value="item.id"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="表头业务员" prop="k3ServiceId">
-                    <el-select
-                      v-model="screenForm.k3ServiceId"
-                      placeholder="选择表头业务员"
-                      clearable
-                      filterable
-                      style="width: 100%"
-                    >
-                      <el-option
-                        v-for="item in salesmanList"
-                        :key="item.adminUserId"
-                        :label="item.nickName"
-                        :value="item.adminUserId"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="表体业务员" prop="salesMan">
-                    <el-select
-                      v-model="screenForm.salesMan"
-                      placeholder="选择表体业务员"
-                      clearable
-                      filterable
-                      style="width: 100%"
-                    >
-                      <el-option
-                        v-for="item in salesmanList"
-                        :key="item.adminUserId"
-                        :label="item.nickName"
-                        :value="item.adminUserId"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="审核时间" prop="approvaTime">
-                    <el-date-picker
-                      v-model="screenForm.approvaTime"
-                      type="datetimerange"
-                      range-separator="至"
-                      style="width: 100%"
-                      value-format="yyyy-MM-dd HH:mm:ss"
-                      start-placeholder="开始日期"
-                      end-placeholder="结束日期"
-                    />
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="申请发货单类型" prop="types">
-                    <el-select
-                      v-model="screenForm.types"
-                      placeholder="选择申请发货单类型"
-                      clearable
-                      filterable
-                      style="width: 100%"
-                    >
-                      <el-option
-                        v-for="item in invoiceList"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                      />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="打印状态" prop="printStatus">
-                    <el-select
-                      v-model="screenForm.printStatus"
-                      placeholder="选择打印状态"
-                      clearable
-                      filterable
-                      style="width: 100%"
-                    >
-                      <el-option label="是" :value="1" />
-                      <el-option label="否" :value="0" />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="区域" prop="discriminate">
-                    <el-select
-                      v-model="screenForm.discriminate"
-                      placeholder="选择区域"
-                      clearable
-                      filterable
-                      style="width: 100%"
-                    >
-                      <el-option label="广州" value="GZ" />
-                      <el-option label="佛山" value="FS" />
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="工程登录单号" prop="refEnginRecordNo">
-                    <el-input v-model="screenForm.refEnginRecordNo" placeholder="请输入工程登录单号" />
-                  </el-form-item>
-                </el-col>
-                <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="制单人" prop="createBy">
-                    <el-input v-model="screenForm.createBy" placeholder="请输入制单人" />
-                  </el-form-item>
-                </el-col>
-              </el-row>
-            </el-form>
-          </template>
+            <el-form
+          ref="screenForm"
+          :model="screenForm"
+          label-width="120px"
+          size="mini"
+          label-position="left"
+        >
+          <el-row :gutter="20">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="产品名称" prop="goodsName">
+                <el-input
+                  v-model="screenForm.goodsName"
+                  placeholder="请输入产品名称"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="物料编码" prop="goodsCode">
+                <el-input
+                  v-model="screenForm.goodsCode"
+                  placeholder="请输入物料编码"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="产品编码" prop="goodsOldCode">
+                <el-input
+                  v-model="screenForm.goodsOldCode"
+                  placeholder="请输入产品编码"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="规格型号" prop="model">
+                <el-input
+                  v-model="screenForm.model"
+                  placeholder="请输入规格型号"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="制单日期" prop="createDate">
+                <el-date-picker
+                  v-model="screenForm.createDate"
+                  type="datetimerange"
+                  range-separator="至"
+                  style="width: 100%"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="发货日期" prop="deliverDate">
+                <el-date-picker
+                  v-model="screenForm.deliverDate"
+                  type="datetimerange"
+                  range-separator="至"
+                  style="width: 100%"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="经销商编号" prop="jxsNum">
+                <el-input
+                  v-model="screenForm.jxsNum"
+                  placeholder="请输入经销商编号"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="经销商名称" prop="jxsName">
+                <el-input
+                  v-model="screenForm.jxsName"
+                  placeholder="请输入经销商名称"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="发货单号" prop="orderNum">
+                <el-input
+                  v-model="screenForm.orderNum"
+                  placeholder="请输入发货单号"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="订单" prop="mainOrderId">
+                <el-input
+                  v-model="screenForm.mainOrderId"
+                  placeholder="请输入订单"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="存货类别" prop="type">
+                <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-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="仓库" prop="correspondId">
+                <el-select
+                  v-model="screenForm.correspondId"
+                  multiple
+                  style="width: 100%"
+                  placeholder="请选择仓库"
+                  size="mini"
+                  filterable
+                  clearable
+                >
+                  <el-option
+                    v-for="(item, index) in warehouseList"
+                    :key="index"
+                    :label="item.name"
+                    :value="item.id"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="表头业务员" prop="k3ServiceId">
+                <el-select
+                  v-model="screenForm.k3ServiceId"
+                  placeholder="选择表头业务员"
+                  clearable
+                  filterable
+                  style="width: 100%"
+                >
+                  <el-option
+                    v-for="item in salesmanList"
+                    :key="item.adminUserId"
+                    :label="item.nickName"
+                    :value="item.adminUserId"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="表体业务员" prop="salesMan">
+                <el-select
+                  v-model="screenForm.salesMan"
+                  placeholder="选择表体业务员"
+                  clearable
+                  filterable
+                  style="width: 100%"
+                >
+                  <el-option
+                    v-for="item in salesmanList"
+                    :key="item.adminUserId"
+                    :label="item.nickName"
+                    :value="item.adminUserId"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="审核时间" prop="approvaTime">
+                <el-date-picker
+                  v-model="screenForm.approvaTime"
+                  type="datetimerange"
+                  range-separator="至"
+                  style="width: 100%"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="申请发货单类型" prop="types">
+                <el-select
+                  v-model="screenForm.types"
+                  placeholder="选择申请发货单类型"
+                  clearable
+                  filterable
+                  style="width: 100%"
+                >
+                  <el-option
+                    v-for="item in invoiceList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="预约提货打印" prop="printStatus">
+                <el-select
+                  v-model="screenForm.printStatus"
+                  placeholder="选择预约提货打印"
+                  clearable
+                  filterable
+                  style="width: 100%"
+                >
+                  <el-option
+                    label="是"
+                    :value="1"
+                  />
+                  <el-option
+                    label="否"
+                    :value="0"
+                  />
+
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="区域" prop="discriminate">
+                <el-select
+                  v-model="screenForm.discriminate"
+                  placeholder="选择区域"
+                  clearable
+                  filterable
+                  style="width: 100%"
+                >
+                  <el-option
+                    label="广州"
+                    value="GZ"
+                  />
+                  <el-option
+                    label="佛山"
+                    value="FS"
+                  />
+
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="工程登录单号" prop="refEnginRecordNo">
+                <el-input
+                  v-model="screenForm.refEnginRecordNo"
+                  placeholder="请输入工程登录单号"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="制单人" prop="createBy">
+                <el-input v-model="screenForm.createBy" placeholder="请输入制单人" />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="发货汇总打印" prop="invoicePrintStatus">
+                <el-select
+                  v-model="screenForm.invoicePrintStatus"
+                  placeholder="选择发货汇总打印"
+                  clearable
+                  filterable
+                  style="width: 100%"
+                >
+                  <el-option
+                    label="是"
+                    :value="1"
+                  />
+                  <el-option
+                    label="否"
+                    :value="0"
+                  />
+
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+        </el-form>
+        </template>
         </Collapse>
       </div>
 

src/views/supply/pickup/sum_list.vue

@@ -9,93 +9,88 @@
         </template>
         <template #search>
           <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
-            <el-row :gutter="20">
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="申请发货单号" prop="orderNum">
-                  <el-input v-model="screenForm.orderNum" placeholder="请输入申请发货单号"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="经销商名称" prop="jxsName">
-                  <el-input v-model="screenForm.jxsName" placeholder="请输入经销商名称"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="经销商编码" prop="jxsNum">
-                  <el-input v-model="screenForm.jxsNum" placeholder="请输入经销商编码"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="仓库" prop="warehouse">
-                  <el-input v-model="screenForm.warehouse" placeholder="请输入仓库"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="状态" prop="status">
-                  <el-select v-model="screenForm.status" placeholder="请选择">
-                    <el-option label="未打单" :value="0"> </el-option>
-                    <el-option label="已打单" :value="1"> </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="手机号" prop="takerPhone">
-                  <el-input
-                    type="number"
-                    @mousewheel.native.prevent
-                    v-model.number="screenForm.takerPhone"
-                    placeholder="请输入手机号"
-                  ></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="提货人" prop="takerId">
-                  <el-select v-model="screenForm.takerId" placeholder="请选择">
-                    <el-option v-for="item in pickupManList" :key="item.id" :label="item.takerName" :value="item.id">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="申请日期" prop="date">
-                  <el-date-picker
-                    v-model="screenForm.date"
-                    type="datetimerange"
-                    range-separator="至"
-                    style="width: 100%"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                  >
-                  </el-date-picker>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="打印时间" prop="printTime">
-                  <el-date-picker
-                    v-model="screenForm.printTime"
-                    type="datetimerange"
-                    range-separator="至"
-                    style="width: 100%"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                  >
-                  </el-date-picker>
-                </el-form-item>
-              </el-col>
-              <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="出库单号" prop="salesOrderId">
-                  <el-input
-                    type="number"
-                    @mousewheel.native.prevent
-                    v-model.number="screenForm.salesOrderId"
-                    placeholder="请输入出库单号"
-                  ></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
+        <el-row :gutter="20">
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="申请发货单号" prop="orderNum">
+              <el-input v-model="screenForm.orderNum" placeholder="请输入申请发货单号" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="经销商名称" prop="jxsName">
+              <el-input v-model="screenForm.jxsName" placeholder="请输入经销商名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="经销商编码" prop="jxsNum">
+              <el-input v-model="screenForm.jxsNum" placeholder="请输入经销商编码" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="仓库" prop="warehouse">
+              <el-input v-model="screenForm.warehouse" placeholder="请输入仓库" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="状态" prop="status">
+              <el-select v-model="screenForm.status" placeholder="请选择">
+                <el-option label="未打单" :value="0" />
+                <el-option label="已打单" :value="1" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="手机号" prop="takerPhone">
+              <el-input v-model.number="screenForm.takerPhone" type="number" placeholder="请输入手机号" @mousewheel.native.prevent />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="提货人" prop="takerId">
+              <el-select
+                v-model="screenForm.takerId"
+                placeholder="请选择"
+                clearable
+                filterable
+              >
+                <el-option v-for="item in pickupManList" :key="item.id" :label="item.takerName" :value="item.id">
+                  <template>
+                    <span>{{ item.takerName }}</span>
+                    <span style="color: #cccccc"> {{ item.customerName }}</span>
+                  </template>
+                </el-option>
+
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="申请日期" prop="date">
+              <el-date-picker v-model="screenForm.date" type="datetimerange" range-separator="至" style="width: 100%;" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="打印时间" prop="printTime">
+              <el-date-picker v-model="screenForm.printTime" type="datetimerange" range-separator="至" style="width: 100%;" value-format="yyyy-MM-dd HH:mm:ss" start-placeholder="开始日期" end-placeholder="结束日期" />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="出库单号" prop="salesOrderId">
+              <el-input v-model.number="screenForm.salesOrderId" type="number" placeholder="请输入出库单号" @mousewheel.native.prevent />
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="物流公司" prop="logisticsId">
+              <el-select
+                v-model="screenForm.logisticsId"
+                placeholder="请选择物流公司"
+                clearable
+                filterable
+              >
+                <el-option v-for="item in logisticsList" :key="item.id" :label="item.logisticsCompany" :value="item.id" />
+
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
         </template>
       </Collapse>
     </div>