Parcourir la source

Merge commit 'e55fab7f4a69b89ad5e6a8e6fbdb1e8aad6eb238' into HEAD

gitadmin il y a 1 an
Parent
commit
0e263ebcdc
56 fichiers modifiés avec 766 ajouts et 529 suppressions
  1. 1 1
      public/version.json
  2. 10 0
      src/api/product.js
  3. 4 0
      src/components/index.less
  4. 13 2
      src/config/router.config.js
  5. 178 172
      src/views/allocationManagement/transferOut/edit.vue
  6. 17 13
      src/views/allocationManagement/transferReturn/edit.vue
  7. 16 13
      src/views/allocationManagement/transferReturn/editGrp.vue
  8. 1 1
      src/views/common/editInput.js
  9. 1 1
      src/views/dealerManagement/dealerAccountManagement/editModal.vue
  10. 1 1
      src/views/dealerManagement/merchantInfoManagement/edit.vue
  11. 2 2
      src/views/expenseManagement/expenseReimbursement/epenseCdfModal.vue
  12. 1 1
      src/views/expenseManagement/expenseReimbursement/productInfoModal.vue
  13. 1 1
      src/views/financialManagement/financialCollection/fcDetailSxItem.vue
  14. 2 2
      src/views/inventoryManagement/inventoryWarning/list.vue
  15. 1 1
      src/views/inventoryManagement/makeInventory/check.vue
  16. 1 1
      src/views/inventoryManagement/supervisionDisk/check.vue
  17. 21 2
      src/views/productManagement/newProduct/list.vue
  18. 1 1
      src/views/productManagement/productInfo/edit.vue
  19. 9 4
      src/views/productManagement/productPricing/auditModal.vue
  20. 5 5
      src/views/productManagement/productPricing/editModal.vue
  21. 59 27
      src/views/productManagement/productPricing/list.vue
  22. 2 2
      src/views/promotionRulesManagement/dealerPromotions/addModal.vue
  23. 4 4
      src/views/promotionRulesManagement/dealerPromotions/sendAmountModal.vue
  24. 7 7
      src/views/promotionRulesManagement/dealerPromotions/sendProductsModal.vue
  25. 10 10
      src/views/promotionRulesManagement/dealerPromotions/specialOfferModal.vue
  26. 1 1
      src/views/promotionRulesManagement/dealerPromotions/tableType1.vue
  27. 7 7
      src/views/promotionRulesManagement/dealerPromotions/tableType3.vue
  28. 3 3
      src/views/promotionRulesManagement/promotionRules/basicInfoModal.vue
  29. 6 6
      src/views/promotionRulesManagement/promotionRules/editRuleModal.vue
  30. 1 1
      src/views/purchasingManagement/bulkWarehousingOrder/productModal.vue
  31. 18 5
      src/views/purchasingManagement/purchaseReturn/addModal.vue
  32. 21 20
      src/views/purchasingManagement/purchaseReturn/detailModal.vue
  33. 100 96
      src/views/purchasingManagement/purchaseReturn/list.vue
  34. 37 27
      src/views/purchasingManagement/purchaseReturn/purchaseReturnDeatil.vue
  35. 18 10
      src/views/purchasingManagement/purchaseReturn/queryPart.vue
  36. 31 12
      src/views/reportData/salesDetails/list.vue
  37. 8 0
      src/views/salesManagement/outboundOrder/list.vue
  38. 27 19
      src/views/salesManagement/outboundOrder/sendGoodModal.vue
  39. 1 1
      src/views/salesManagement/salesList/list.vue
  40. 1 1
      src/views/salesManagement/salesQuery/chooseActive.vue
  41. 1 1
      src/views/salesManagement/salesQuery/edit.vue
  42. 1 1
      src/views/salesManagement/salesQuery/queryPart.vue
  43. 1 1
      src/views/salesManagement/salesQuery/queryPromotable.vue
  44. 1 1
      src/views/salesManagement/salesQueryNew/comps/activeQueryPart.vue
  45. 1 1
      src/views/salesManagement/salesQueryNew/comps/productList.vue
  46. 1 1
      src/views/salesManagement/salesQueryNew/comps/productNormalList.vue
  47. 1 1
      src/views/salesManagement/salesQueryNew/comps/queryPart.vue
  48. 62 13
      src/views/salesManagement/salesQueryNew/list.vue
  49. 1 1
      src/views/salesReturnManagement/billOfLading/add.vue
  50. 2 2
      src/views/salesReturnManagement/receiveCheck/receiving.vue
  51. 35 12
      src/views/salesReturnManagement/returnSchedule/list.vue
  52. 2 2
      src/views/salesReturnManagement/salesReturn/queryPart.vue
  53. 3 3
      src/views/salesReturnManagement/salesReturn/salesReturnEdit.vue
  54. 1 1
      src/views/supplierManagement/associatedProduct/settingCost.vue
  55. 1 1
      src/views/supplierManagement/costSetting/settingCost.vue
  56. 4 4
      src/views/supplierManagement/supplierInfo/edit.vue

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.2.29",
+    "version": "2.2.33",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 10 - 0
src/api/product.js

@@ -22,6 +22,16 @@ export const queryOnlinePageList = (params) => {
     method: 'post'
   })
 }
+// 产品上线信息导出
+export const productLogExportExcel = (params) => {
+  return axios({
+    url: '/productLog/exportExcel',
+    data: params,
+    method: 'post',
+    responseType: 'blob'
+  })
+}
+
 //  产品 列表 已定过价的 分页
 export const productPricedList = (params) => {
   const url = `/product/queryPricedPage/${params.pageNo}/${params.pageSize}`

+ 4 - 0
src/components/index.less

@@ -378,4 +378,8 @@
     float: none;
     text-align: center;
   }
+}
+
+.ant-notification-notice-description{
+  white-space: pre-wrap !important;
 }

+ 13 - 2
src/config/router.config.js

@@ -937,7 +937,18 @@ export const asyncRouterMap = [
                 name: 'purchaseReturnEdit',
                 component: () => import(/* webpackChunkName: "purchasingManagement" */ '@/views/purchasingManagement/purchaseReturn/purchaseReturnDeatil.vue'),
                 meta: {
-                  title: '编辑采购退货',
+                  title: '编辑采购退货(不抓单)',
+                  icon: 'gold',
+                  hidden: true,
+                  permission: 'B_purchaseReturnEdit'
+                }
+              },
+              {
+                path: 'editGrab',
+                name: 'purchaseReturnEditGrab',
+                component: () => import(/* webpackChunkName: "purchasingManagement" */ '@/views/purchasingManagement/purchaseReturn/purchaseReturnDeatil.vue'),
+                meta: {
+                  title: '编辑采购退货(抓单)',
                   icon: 'gold',
                   hidden: true,
                   permission: 'B_purchaseReturnEdit'
@@ -3420,7 +3431,7 @@ export const asyncRouterMap = [
                 meta: {
                   title: '实时销售看板'
                 }
-              },
+              }
             ]
           },
           {

+ 178 - 172
src/views/allocationManagement/transferOut/edit.vue

@@ -105,189 +105,190 @@
       </a-card>
       <!-- 选择产品 -->
       <a-card size="small" title="选择产品" :bordered="false" class="allocateBillEdit-cont">
-            <!-- 筛选条件 -->
+        <!-- 筛选条件 -->
+        <div class="table-page-search-wrapper">
+          <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+            <a-row :gutter="15">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="产品编码" prop="productCode">
+                  <a-input id="allocateBillEdit-productCode" v-model.trim="queryParam.productCode" placeholder="请输入产品编码" allowClear />
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="产品名称" prop="productName">
+                  <a-input id="allocateBillEdit-productName" v-model.trim="queryParam.productName" placeholder="请输入产品名称" allowClear />
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="原厂编码" prop="productOrigCode">
+                  <a-input id="allocateBillEdit-productOrigCode" v-model.trim="queryParam.productOrigCode" placeholder="请输入原厂编码" allowClear />
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+                <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="storeTransferOutList-refresh">查询</a-button>
+                <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="storeTransferOutList-reset">重置</a-button>
+              </a-col>
+            </a-row>
+          </a-form>
+        </div>
+        <!-- 列表 -->
+        <s-table
+          class="sTable"
+          ref="table"
+          size="small"
+          index="0"
+          tableId="table1"
+          :rowKey="(record) => record.stockSn"
+          :columns="columns"
+          :customRow="handleClickRow"
+          :data="loadData"
+          :defaultLoadData="false"
+          :scroll="{ y: 300 }"
+          bordered>
+          <!-- 调出数量 -->
+          <template slot="qty" slot-scope="text, record">
+            <a-input-number
+              size="small"
+              v-model="record.qty"
+              :precision="0"
+              :min="1"
+              :max="record.currentStockQty"
+              placeholder="请输入"
+              style="width: 100%;" />
+          </template>
+          <!-- 操作 -->
+          <template slot="action1" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              class="button-primary"
+              :loading="spinning"
+              @click="handleAdd(record, false, 'noRefresh')"
+            >添加</a-button>
+          </template>
+        </s-table>
+      </a-card>
+      <!-- 已选产品 -->
+      <a-card size="small" title="已选产品" :bordered="false" class="allocateBillEdit-cont">
+        <!-- 总计 -->
+        <a-alert type="info" style="margin-bottom:10px">
+          <div slot="message">
+            总数量:<strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong> ;
+            <span v-if="$hasPermissions('M_transferOut_edit_costPrice')">总成本:<strong>{{ (productTotal&&(productTotal.totalCost || productTotal.totalCost==0)) ? toThousands(productTotal.totalCost) : '--' }}</strong> ;</span>
+            <span v-if="$hasPermissions('M_transferOut_edit_salesPrice')">总售价:<strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? toThousands(productTotal.totalPrice) : '--' }}</strong>;</span>
+          </div>
+        </a-alert>
+        <!-- 筛选条件 -->
+        <a-row :gutter="15">
+          <a-col :span="16">
             <div class="table-page-search-wrapper">
-              <a-form layout="inline" @keyup.enter.native="$refs.table.refresh(true)">
+              <a-form layout="inline" @keyup.enter.native="$refs.chooseTable.refresh(true)">
                 <a-row :gutter="15">
-                  <a-col :md="6" :sm="24">
+                  <a-col :md="9" :sm="24">
                     <a-form-item label="产品编码" prop="productCode">
-                      <a-input id="allocateBillEdit-productCode" v-model.trim="queryParam.productCode" placeholder="请输入产品编码" allowClear />
+                      <a-input id="allocateBillEdit-productCode" v-model.trim="chooseQueryParam.productCode" placeholder="请输入产品编码" allowClear />
                     </a-form-item>
                   </a-col>
-                  <a-col :md="6" :sm="24">
+                  <a-col :md="9" :sm="24">
                     <a-form-item label="产品名称" prop="productName">
-                      <a-input id="allocateBillEdit-productName" v-model.trim="queryParam.productName" placeholder="请输入产品名称" allowClear />
-                    </a-form-item>
-                  </a-col>
-                  <a-col :md="6" :sm="24">
-                    <a-form-item label="原厂编码" prop="productOrigCode">
-                      <a-input id="allocateBillEdit-productOrigCode" v-model.trim="queryParam.productOrigCode" placeholder="请输入原厂编码" allowClear />
+                      <a-input id="allocateBillEdit-productName" v-model.trim="chooseQueryParam.productName" placeholder="请输入产品名称" allowClear />
                     </a-form-item>
                   </a-col>
                   <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
-                    <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="storeTransferOutList-refresh">查询</a-button>
-                    <a-button style="margin-left: 8px" @click="resetSearchForm" :disabled="disabled" id="storeTransferOutList-reset">重置</a-button>
+                    <a-button type="primary" @click="$refs.chooseTable.refresh(true)" :disabled="chooseDisabled" id="storeTransferOutList-refresh">查询</a-button>
+                    <a-button style="margin-left: 8px" @click="chooseResetSearchForm" :disabled="chooseDisabled" id="storeTransferOutList-reset">重置</a-button>
                   </a-col>
                 </a-row>
               </a-form>
             </div>
-            <!-- 列表 -->
-            <s-table
-              class="sTable"
-              ref="table"
+          </a-col>
+          <a-col :span="8" style="text-align: right;">
+            <span v-if="selNums">已选{{ selNums }}项</span>
+            <a-button
+              style="margin:0 10px;"
+              id="salesEdit-plDel-btn"
+              @click="openPlSet">批量设置费用归属</a-button>
+            <a-button id="allocateBillEdit-import-btn" @click="openGuideModal=true">导入产品</a-button>
+            <a-button type="danger" style="margin-left: 10px" @click.stop="handleDel('', 'all')" id="chainTransferOutEdit-del-all-btn">整单删除</a-button>
+          </a-col>
+        </a-row>
+        <!-- 列表 -->
+        <s-table
+          class="sTable"
+          ref="chooseTable"
+          size="small"
+          index="1"
+          tableId="table2"
+          :rowKey="(record) => record.id"
+          :row-selection="{ columnWidth: 40 }"
+          @rowSelection="rowSelectionFun"
+          :columns="chooseColumns"
+          :data="chooseLoadData"
+          :defaultLoadData="false"
+          :pagination="{pageSizeOptions: ['20','50','100','200','500']}"
+          :pageSize="20"
+          :scroll="{ y: 300 }"
+          bordered>
+          <!-- 售价 -->
+          <template slot="price" slot-scope="text, record, index">
+            <!-- 调往对象为经销商时不可编辑售价,为员工或其他时可编辑售价 -->
+            <div v-if="$route.params.dealerLevel == 'OTHER'">
+              <a-select
+                size="small"
+                id="allocateBillEdit-price"
+                option-label-prop="label"
+                v-model="record.price"
+                placeholder="请选择"
+                @change="e => priceChange(e, record)"
+                @focus="e => priceFocus(record, index)"
+                style="width: 100%;">
+                <a-select-option v-if="record.cost" :value="record.cost" :key="'cb-'+record.cost" :label="record.cost">成本 {{ record.cost }}</a-select-option>
+                <a-select-option v-if="loadDataSource&&loadDataSource[index]&&loadDataSource[index].provincePrice" :value="loadDataSource[index].provincePrice" :key="'A-'+loadDataSource[index].productSn" :label="loadDataSource[index].provincePrice">A价 {{ loadDataSource[index].provincePrice }}</a-select-option>
+                <a-select-option v-if="loadDataSource&&loadDataSource[index]&&loadDataSource[index].cityPrice" :value="loadDataSource[index].cityPrice" :key="'B-'+loadDataSource[index].productSn" :label="loadDataSource[index].cityPrice">B价 {{ loadDataSource[index].cityPrice }}</a-select-option>
+                <a-select-option v-if="loadDataSource&&loadDataSource[index]&&loadDataSource[index].specialPrice" :value="loadDataSource[index].specialPrice" :key="'C-'+loadDataSource[index].productSn" :label="loadDataSource[index].specialPrice">C价 {{ loadDataSource[index].specialPrice }}</a-select-option>
+              </a-select>
+            </div>
+            <span v-else>{{ toThousands(record.price) }}</span>
+          </template>
+          <!-- 调出数量 -->
+          <template slot="qty" slot-scope="text, record">
+            <a-input-number
               size="small"
-              index="0"
-              tableId="table1"
-              :rowKey="(record) => record.stockSn"
-              :columns="columns"
-              :customRow="handleClickRow"
-              :data="loadData"
-              :defaultLoadData="false"
-              :scroll="{ y: 300 }"
-              bordered>
-              <!-- 调出数量 -->
-              <template slot="qty" slot-scope="text, record">
-                <a-input-number
-                  size="small"
-                  v-model="record.qty"
-                  :precision="0"
-                  :min="1"
-                  :max="record.currentStockQty"
-                  placeholder="请输入"
-                  style="width: 100%;" />
-              </template>
-              <!-- 操作 -->
-              <template slot="action1" slot-scope="text, record">
-                <a-button
-                  size="small"
-                  type="link"
-                  class="button-primary"
-                  :loading="spinning"
-                  @click="handleAdd(record, false, 'noRefresh')"
-                >添加</a-button>
-              </template>
-            </s-table>
-      </a-card>
-      <!-- 已选产品 -->
-      <a-card size="small" title="已选产品" :bordered="false" class="allocateBillEdit-cont">
-            <!-- 总计 -->
-            <a-alert type="info" style="margin-bottom:10px">
-              <div slot="message">
-                总数量:<strong>{{ (productTotal&&(productTotal.totalQty || productTotal.totalQty==0)) ? productTotal.totalQty : '--' }}</strong> ;
-                <span v-if="$hasPermissions('M_transferOut_edit_costPrice')">总成本:<strong>{{ (productTotal&&(productTotal.totalCost || productTotal.totalCost==0)) ? toThousands(productTotal.totalCost) : '--' }}</strong> ;</span>
-                <span v-if="$hasPermissions('M_transferOut_edit_salesPrice')">总售价:<strong>{{ (productTotal&&(productTotal.totalPrice || productTotal.totalPrice==0)) ? toThousands(productTotal.totalPrice) : '--' }}</strong>;</span>
-              </div>
-            </a-alert>
-            <!-- 筛选条件 -->
-            <a-row :gutter="15">
-              <a-col :span="16">
-                <div class="table-page-search-wrapper">
-                  <a-form layout="inline" @keyup.enter.native="$refs.chooseTable.refresh(true)">
-                    <a-row :gutter="15">
-                      <a-col :md="9" :sm="24">
-                        <a-form-item label="产品编码" prop="productCode">
-                          <a-input id="allocateBillEdit-productCode" v-model.trim="chooseQueryParam.productCode" placeholder="请输入产品编码" allowClear />
-                        </a-form-item>
-                      </a-col>
-                      <a-col :md="9" :sm="24">
-                        <a-form-item label="产品名称" prop="productName">
-                          <a-input id="allocateBillEdit-productName" v-model.trim="chooseQueryParam.productName" placeholder="请输入产品名称" allowClear />
-                        </a-form-item>
-                      </a-col>
-                      <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
-                        <a-button type="primary" @click="$refs.chooseTable.refresh(true)" :disabled="chooseDisabled" id="storeTransferOutList-refresh">查询</a-button>
-                        <a-button style="margin-left: 8px" @click="chooseResetSearchForm" :disabled="chooseDisabled" id="storeTransferOutList-reset">重置</a-button>
-                      </a-col>
-                    </a-row>
-                  </a-form>
-                </div>
-              </a-col>
-              <a-col :span="8" style="text-align: right;">
-                <span v-if="selNums">已选{{ selNums }}项</span>
-                <a-button
-                  style="margin:0 10px;"
-                  id="salesEdit-plDel-btn"
-                  @click="openPlSet">批量设置费用归属</a-button>
-                <a-button id="allocateBillEdit-import-btn" @click="openGuideModal=true">导入产品</a-button>
-                <a-button type="danger" style="margin-left: 10px" @click.stop="handleDel('', 'all')" id="chainTransferOutEdit-del-all-btn">整单删除</a-button>
-              </a-col>
-            </a-row>
-            <!-- 列表 -->
-            <s-table
-              class="sTable"
-              ref="chooseTable"
+              id="allocateBillEdit-qty"
+              v-model="record.qty"
+              :precision="0"
+              :min="1"
+              :max="999999"
+              placeholder="请输入"
+              @blur="e => qtyBlur(e.target.value, record)"
+              style="width: 100%;" />
+          </template>
+          <!-- 费用归属部门 -->
+          <template slot="department" slot-scope="text, record">
+            <a-select
+              style="width:100%"
+              placeholder="请选择部门"
+              size="small"
+              allowClear
+              v-model="record.departmentSn"
+              :showSearch="true"
+              @change="e => handleChange(e, record)"
+              option-filter-prop="children"
+              :filter-option="filterOption">
+              <a-select-option v-for="item in departmentList" :key="item.departmentSn" :value="item.departmentSn">{{ item.name }}</a-select-option>
+            </a-select>
+          </template>
+          <!-- 操作 -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
               size="small"
-              index="1"
-              tableId="table2"
-              :rowKey="(record) => record.id"
-              :row-selection="{ columnWidth: 40 }"
-              @rowSelection="rowSelectionFun"
-              :columns="chooseColumns"
-              :data="chooseLoadData"
-              :pagination="{pageSizeOptions: ['20','50','100','200','500']}"
-              :pageSize="20"
-              :scroll="{ y: 300 }"
-              bordered>
-              <!-- 售价 -->
-              <template slot="price" slot-scope="text, record, index">
-                <!-- 调往对象为经销商时不可编辑售价,为员工或其他时可编辑售价 -->
-                <div v-if="$route.params.dealerLevel == 'OTHER'">
-                  <a-select
-                    size="small"
-                    id="allocateBillEdit-price"
-                    option-label-prop="label"
-                    v-model="record.price"
-                    placeholder="请选择"
-                    @change="e => priceChange(e, record)"
-                    @focus="e => priceFocus(record, index)"
-                    style="width: 100%;">
-                    <a-select-option v-if="record.cost" :value="record.cost" :key="'cb-'+record.cost" :label="record.cost">成本 {{ record.cost }}</a-select-option>
-                    <a-select-option v-if="loadDataSource&&loadDataSource[index]&&loadDataSource[index].provincePrice" :value="loadDataSource[index].provincePrice" :key="'A-'+loadDataSource[index].productSn" :label="loadDataSource[index].provincePrice">A价 {{ loadDataSource[index].provincePrice }}</a-select-option>
-                    <a-select-option v-if="loadDataSource&&loadDataSource[index]&&loadDataSource[index].cityPrice" :value="loadDataSource[index].cityPrice" :key="'B-'+loadDataSource[index].productSn" :label="loadDataSource[index].cityPrice">B价 {{ loadDataSource[index].cityPrice }}</a-select-option>
-                    <a-select-option v-if="loadDataSource&&loadDataSource[index]&&loadDataSource[index].specialPrice" :value="loadDataSource[index].specialPrice" :key="'C-'+loadDataSource[index].productSn" :label="loadDataSource[index].specialPrice">C价 {{ loadDataSource[index].specialPrice }}</a-select-option>
-                  </a-select>
-                </div>
-                <span v-else>{{ toThousands(record.price) }}</span>
-              </template>
-              <!-- 调出数量 -->
-              <template slot="qty" slot-scope="text, record">
-                <a-input-number
-                  size="small"
-                  id="allocateBillEdit-qty"
-                  v-model="record.qty"
-                  :precision="0"
-                  :min="1"
-                  :max="999999"
-                  placeholder="请输入"
-                  @blur="e => qtyBlur(e.target.value, record)"
-                  style="width: 100%;" />
-              </template>
-              <!-- 费用归属部门 -->
-              <template slot="department" slot-scope="text, record">
-                <a-select
-                  style="width:100%"
-                  placeholder="请选择部门"
-                  size="small"
-                  allowClear
-                  v-model="record.departmentSn"
-                  :showSearch="true"
-                  @change="e => handleChange(e, record)"
-                  option-filter-prop="children"
-                  :filter-option="filterOption">
-                  <a-select-option v-for="item in departmentList" :key="item.departmentSn" :value="item.departmentSn">{{ item.name }}</a-select-option>
-                </a-select>
-              </template>
-              <!-- 操作 -->
-              <template slot="action" slot-scope="text, record">
-                <a-button
-                  size="small"
-                  type="link"
-                  class="button-error"
-                  :loading="spinning"
-                  @click="handleDel(record)"
-                  id="allocateBillEdit-del-btn">删除</a-button>
-              </template>
-            </s-table>
+              type="link"
+              class="button-error"
+              :loading="spinning"
+              @click="handleDel(record)"
+              id="allocateBillEdit-del-btn">删除</a-button>
+          </template>
+        </s-table>
       </a-card>
     </div>
     <div class="affix-cont" v-if="basicInfoData">
@@ -379,9 +380,9 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        const dealerLevel = this.$route.params.dealerLevel == 'OTHER' ? undefined : this.$route.params.dealerLevel
+        const dealerLevel = this.dealerLevel == 'OTHER' ? undefined : this.dealerLevel
         const warehouseSn = this.basicInfoData.warehouseSn
-        const fun = this.$route.params.dealerLevel == 'OTHER' ? queryStockProductForOtherPage : queryStockProductPage
+        const fun = this.dealerLevel == 'OTHER' ? queryStockProductForOtherPage : queryStockProductPage
         return fun(Object.assign(parameter, this.queryParam, { zeroQtyFlag: '0', dealerLevel: dealerLevel, warehouseSn: warehouseSn })).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
@@ -399,7 +400,7 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       chooseLoadData: parameter => {
         this.chooseDisabled = true
-        const params = Object.assign(parameter, this.chooseQueryParam, { allocateSn: this.$route.params.sn })
+        const params = Object.assign(parameter, this.chooseQueryParam, { allocateSn: this.allocateSn })
         return allocateBillDetailList(params).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
@@ -421,7 +422,9 @@ export default {
       openModal: false,
       nowType: null,
       rowSelectionInfo: null,
-      plSetVal: undefined
+      plSetVal: undefined,
+      dealerLevel: undefined,
+      allocateSn: undefined
     }
   },
   computed: {
@@ -540,6 +543,7 @@ export default {
       this.queryParam.productOrigCode = ''
       if (!flag) {
         this.$refs.table.refresh(true)
+        this.$refs.chooseTable.refresh(true)
       }
     },
     // 双击快速添加
@@ -781,6 +785,8 @@ export default {
       this.$refs.chooseTable.refresh()
     },
     pageInit () {
+      this.dealerLevel = this.$route.params.dealerLevel
+      this.allocateSn = this.$route.params.sn
       this.getDepartmentList()
       this.getDetail()
     }

+ 17 - 13
src/views/allocationManagement/transferReturn/edit.vue

@@ -13,7 +13,7 @@
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra">
-          <print :params="{allocateReturnSn: $route.params.sn || outBizSn}" :basicInfoData="basicInfoData" :disabled="localDataSource.length==0" @loading="spinning=true" @unloading="spinning=false"></print>
+          <print :params="{allocateReturnSn: allocateReturnSn || outBizSn}" :basicInfoData="basicInfoData" :disabled="localDataSource.length==0" @loading="spinning=true" @unloading="spinning=false"></print>
         </template>
       </a-page-header>
       <a-card size="small" :bordered="false" v-if="basicInfoData" class="allocateBillEdit-cont" v-show="showDetail">
@@ -94,7 +94,7 @@
                     v-model="record.productPrice"
                     :precision="2"
                     :min="0"
-                    :max="999999"
+                    :max="99999999"
                     placeholder="请输入"
                     style="width: 100%;" />
                 </div>
@@ -107,7 +107,7 @@
                     v-model="record.qty"
                     :precision="0"
                     :min="1"
-                    :max="999999"
+                    :max="99999999"
                     placeholder="请输入"
                     style="width: 100%;" />
                 </div>
@@ -183,7 +183,7 @@
                   v-model="record.price"
                   :precision="2"
                   :min="0"
-                  :max="999999"
+                  :max="99999999"
                   @blur="e => priceChange(e.target.value, record)"
                   placeholder="请输入"
                   style="width: 100%;" />
@@ -195,7 +195,7 @@
                   v-model="record.returnQty"
                   :precision="0"
                   :min="1"
-                  :max="999999"
+                  :max="99999999"
                   @blur="e => qtyBlur(e.target.value, record)"
                   placeholder="请输入"
                   style="width: 100%;" />
@@ -219,7 +219,7 @@
         style="padding: 0 60px;">提交</a-button>
     </div>
     <!-- 导入产品 -->
-    <!-- <importGuideModal :openModal="openGuideModal" :params="{allocateReturnSn: $route.params.sn}" @close="openGuideModal=false" @ok="handleGuideOk" /> -->
+    <!-- <importGuideModal :openModal="openGuideModal" :params="{allocateReturnSn: allocateReturnSn}" @close="openGuideModal=false" @ok="handleGuideOk" /> -->
     <!-- 修改基础信息 -->
     <a-modal
       centered
@@ -289,7 +289,7 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
-        const dealerLevel = this.$route.params.dealerLevel == 'OTHER' ? undefined : this.$route.params.dealerLevel
+        const dealerLevel = this.dealerLevel == 'OTHER' ? undefined : this.dealerLevel
         const warehouseSn = this.basicInfoData.warehouseSn
         return queryStockProductPage(Object.assign(parameter, this.queryParam, { dealerLevel: dealerLevel == 0 ? '' : dealerLevel, warehouseSn: warehouseSn })).then(res => {
           const data = res.data
@@ -305,10 +305,12 @@ export default {
       },
       loadDataSource: [],
       localDataSource: [],
+      dealerLevel: '',
+      allocateReturnSn: '',
       // 加载数据方法 必须为 Promise 对象
       chooseLoadData: parameter => {
         this.chooseDisabled = true
-        const params = Object.assign(parameter, { product: { name: this.chooseQueryParam.productName, code: this.chooseQueryParam.productCode }, allocateReturnSn: this.$route.params.sn })
+        const params = Object.assign(parameter, { product: { name: this.chooseQueryParam.productName, code: this.chooseQueryParam.productCode }, allocateReturnSn: this.allocateReturnSn })
         return allocReturnDetailQueryPage(params).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
@@ -439,7 +441,7 @@ export default {
     //  添加/编辑
     handleAdd (row, isEdit, isRefresh) {
       const params = {
-        allocateReturnSn: this.$route.params.sn,
+        allocateReturnSn: this.allocateReturnSn,
         productSn: row.productSn,
         price: isEdit ? row.price : row.productPrice,
         returnQty: isEdit ? row.returnQty : row.qty,
@@ -484,7 +486,7 @@ export default {
         centered: true,
         onOk () {
           if (isAll) { //  整单删除
-            // allocateBillDetailDelAll({ sn: _this.$route.params.sn }).then(res => {
+            // allocateBillDetailDelAll({ sn: _this.allocateReturnSn }).then(res => {
             //   if (res.status == 200) {
             //     _this.$message.success(res.message)
             //     _this.refashPage()
@@ -492,7 +494,7 @@ export default {
             // })
           } else { //  单个删除
             allocReturnDetailDelete({
-              allocateReturnSn: _this.$route.params.sn,
+              allocateReturnSn: _this.allocateReturnSn,
               allocateDetailSn: row.allocateDetailSn,
               price: row.price,
               productSn: row.productSn
@@ -514,7 +516,7 @@ export default {
         return
       }
       _this.spinning = true
-      allocateReturnSubmit({ allocateReturnSn: this.$route.params.sn }).then(res => {
+      allocateReturnSubmit({ allocateReturnSn: this.allocateReturnSn }).then(res => {
         if (res.status == 200) {
           this.$message.success(res.message)
           setTimeout(() => {
@@ -529,7 +531,7 @@ export default {
     // 基本信息
     getDetail (flag) {
       this.spinning = true
-      allocateReturnQueryBySn({ allocateReturnSn: this.$route.params.sn }).then(res => {
+      allocateReturnQueryBySn({ allocateReturnSn: this.allocateReturnSn }).then(res => {
         if (res.status == 200) {
           this.basicInfoData = res.data
           if (this.basicInfoData.costTypeSn) {
@@ -568,6 +570,8 @@ export default {
       this.$refs.chooseTable.refresh()
     },
     pageInit () {
+      this.dealerLevel = this.$route.params.dealerLevel
+      this.allocateReturnSn = this.$route.params.sn
       this.refashPage()
     }
   },

+ 16 - 13
src/views/allocationManagement/transferReturn/editGrp.vue

@@ -13,7 +13,7 @@
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
         <template slot="extra">
-          <print :params="{allocateReturnSn: $route.params.sn}" :disabled="localDataSource.length==0" @loading="spinning=true" @unloading="spinning=false"></print>
+          <print :params="{allocateReturnSn: allocateReturnSn}" :disabled="localDataSource.length==0" @loading="spinning=true" @unloading="spinning=false"></print>
         </template>
       </a-page-header>
       <a-card size="small" :bordered="false" v-show="showDetail" class="editGrap-cont">
@@ -110,7 +110,7 @@
                     v-model="record.returnPrice"
                     :precision="2"
                     :min="0"
-                    :max="999999"
+                    :max="99999999"
                     placeholder="请输入"
                     style="width: 100%;" />
                 </div>
@@ -188,7 +188,7 @@
                   @blur="e => priceChange(e.target.value, record)"
                   :precision="2"
                   :min="0"
-                  :max="999999"
+                  :max="99999999"
                   placeholder="请输入"
                   style="width: 100%;" />
               </template>
@@ -211,7 +211,7 @@
         style="padding: 0 60px;">提交</a-button>
     </div>
     <!-- 导入产品 -->
-    <!-- <importGuideModal :openModal="openGuideModal" :params="{allocateReturnSn: $route.params.sn}" @close="openGuideModal=false" @ok="handleGuideOk" /> -->
+    <!-- <importGuideModal :openModal="openGuideModal" :params="{allocateReturnSn: allocateReturnSn}" @close="openGuideModal=false" @ok="handleGuideOk" /> -->
     <!-- 修改基础信息 -->
     <a-modal
       centered
@@ -278,14 +278,15 @@ export default {
       loading: false,
       chooseDisabled: false, //  查询、重置按钮是否可操作
       advanced: false, // 高级搜索 展开/关闭
+      targetType: '',
+      allocateReturnSn: '',
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
         this.disabled = true
         const warehouseSn = this.basicInfoData.warehouseSn
         const targetSn =  this.basicInfoData.targetSn
-        const targetType = this.$route.params.targetType
         const allocateNo = this.queryParam.allocateNo
-        const otherParams = { allocateBill: { targetType: targetType , targetSn:targetSn, allocateNo: allocateNo } }
+        const otherParams = { allocateBill: { targetType: this.targetType , targetSn:targetSn, allocateNo: allocateNo } }
         return allocDetailQueryPageForReturn(Object.assign(parameter, this.queryParam, otherParams)).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
@@ -304,7 +305,7 @@ export default {
       // 加载数据方法 必须为 Promise 对象
       chooseLoadData: parameter => {
         this.chooseDisabled = true
-        const params = Object.assign(parameter, { product: { name: this.chooseQueryParam.productName, code: this.chooseQueryParam.productCode }, allocateReturnSn: this.$route.params.sn })
+        const params = Object.assign(parameter, { product: { name: this.chooseQueryParam.productName, code: this.chooseQueryParam.productCode }, allocateReturnSn: this.allocateReturnSn })
         return allocReturnDetailQueryPage(params).then(res => {
           const data = res.data
           const no = (data.pageNo - 1) * data.pageSize
@@ -390,7 +391,7 @@ export default {
         onOk () {
           _this.spinning = true
           allocReturnDetailInsertBatch({
-            allocateReturnSn: _this.$route.params.sn,
+            allocateReturnSn: _this.allocateReturnSn,
             detailDtoList: obj
           }).then(res => {
             if (res.status == 200) {
@@ -498,7 +499,7 @@ export default {
     //  添加/编辑
     handleAdd (row, isEdit, isRefresh) {
       const params = {
-        allocateReturnSn: this.$route.params.sn,
+        allocateReturnSn: this.allocateReturnSn,
         productSn: row.productSn,
         price: isEdit ? row.price : row.returnPrice,
         allocateNo: row.allocateNo,
@@ -541,7 +542,7 @@ export default {
         centered: true,
         onOk () {
           if (isAll) { //  整单删除
-            // allocReturnDetailDeleteAll({ sn: _this.$route.params.sn }).then(res => {
+            // allocReturnDetailDeleteAll({ sn: _this.allocateReturnSn }).then(res => {
             //   if (res.status == 200) {
             //     _this.$message.success(res.message)
             //     _this.refashPage()
@@ -549,7 +550,7 @@ export default {
             // })
           } else { //  单个删除
             allocReturnDetailDelete({
-              allocateReturnSn: _this.$route.params.sn,
+              allocateReturnSn: _this.allocateReturnSn,
               allocateDetailSn: row.allocateDetailSn,
               price: row.price,
               productSn: row.productSn }).then(res => {
@@ -570,7 +571,7 @@ export default {
         return
       }
       _this.spinning = true
-      allocateReturnSubmit({ allocateReturnSn: this.$route.params.sn }).then(res => {
+      allocateReturnSubmit({ allocateReturnSn: this.allocateReturnSn }).then(res => {
         if (res.status == 200) {
           this.$message.success(res.message)
           setTimeout(() => {
@@ -585,7 +586,7 @@ export default {
     // 基本信息
     getDetail (flag) {
       this.spinning = true
-      allocateReturnQueryBySn({ allocateReturnSn: this.$route.params.sn }).then(res => {
+      allocateReturnQueryBySn({ allocateReturnSn: this.allocateReturnSn }).then(res => {
         if (res.status == 200) {
           this.basicInfoData = res.data
           if (this.basicInfoData.costTypeSn) {
@@ -618,6 +619,8 @@ export default {
       this.$refs.chooseTable.refresh()
     },
     pageInit () {
+      this.targetType = this.$route.params.targetType
+      this.allocateReturnSn = this.$route.params.sn
       this.getDetail()
       this.chooseResetSearchForm()
     }

+ 1 - 1
src/views/common/editInput.js

@@ -40,7 +40,7 @@ const EditableCell = {
     },
     max: {
       type: [Number],
-      default: 999999
+      default: 99999999
     },
     size: {
       type: String,

+ 1 - 1
src/views/dealerManagement/dealerAccountManagement/editModal.vue

@@ -63,7 +63,7 @@
               v-model="form.org.childUserMaxNum"
               :precision="0"
               :min="1"
-              :max="999999"
+              :max="99999999"
               placeholder="请输入数量"
               style="width: 100%;" />
           </a-form-model-item>

+ 1 - 1
src/views/dealerManagement/merchantInfoManagement/edit.vue

@@ -168,7 +168,7 @@
                       v-model="form.busniessScope"
                       :precision="0"
                       :min="1"
-                      :max="999999"
+                      :max="99999999"
                       placeholder="请输入"
                       style="width: 100%;" />
                   </a-form-model-item>

+ 2 - 2
src/views/expenseManagement/expenseReimbursement/epenseCdfModal.vue

@@ -65,7 +65,7 @@
                 @change="splitAmountChange"
                 :precision="2"
                 :min="0"
-                :max="999999"
+                :max="99999999"
                 placeholder="请输入"
               />
               <span v-if="!record.splitObjType">--</span>
@@ -83,7 +83,7 @@
                   v-model="item.splitAmount"
                   :precision="2"
                   :min="0"
-                  :max="999999"
+                  :max="99999999"
                   placeholder="请输入费用"
                 />
                 <div style="padding-left: 15px;" v-if="record.childDetailSplitList&&record.childDetailSplitList.length>1">

+ 1 - 1
src/views/expenseManagement/expenseReimbursement/productInfoModal.vue

@@ -67,7 +67,7 @@
                 v-model="record.expense"
                 :precision="2"
                 :min="0"
-                :max="999999"
+                :max="99999999"
                 placeholder="请输入"
               />
             </template>

+ 1 - 1
src/views/financialManagement/financialCollection/fcDetailSxItem.vue

@@ -8,7 +8,7 @@
         <a-input-number
           style="width:100%"
           :min="0"
-          :max="999999"
+          :max="99999999"
           :precision="2"
           :placeholder="'请输入'+title+'金额'"
           @change="getTotal"

+ 2 - 2
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -113,7 +113,7 @@
               v-model="record.inTransit"
               :precision="0"
               :min="0"
-              :max="999999"
+              :max="99999999"
               style="width: 100%;"
               @change="numChange(record)"
               placeholder="请输入在途数" />
@@ -128,7 +128,7 @@
               v-model="record.upperLimit"
               :precision="0"
               :min="0"
-              :max="999999"
+              :max="99999999"
               style="width: 100%;"
               @change="numChange(record)"
               placeholder="请输入最大库存数" />

+ 1 - 1
src/views/inventoryManagement/makeInventory/check.vue

@@ -101,7 +101,7 @@
               v-model="record.checkQty"
               :precision="0"
               :min="0"
-              :max="999999"
+              :max="99999999"
               placeholder="请输入"
               v-if="record.type=='superior'"
               @blur="e => checkQtyBlur(e.target.value, record)"

+ 1 - 1
src/views/inventoryManagement/supervisionDisk/check.vue

@@ -102,7 +102,7 @@
               v-model="record.checkSuperviseQty"
               :precision="0"
               :min="0"
-              :max="999999"
+              :max="99999999"
               placeholder="请输入"
               v-if="record.type=='superior'"
               @blur="e => checkSuperviseQtyBlur(e.target.value, record)"

+ 21 - 2
src/views/productManagement/newProduct/list.vue

@@ -40,6 +40,14 @@
             <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
               <a-button type="primary" @click="$refs.table.refresh(true)" :disabled="disabled" id="productInfoList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="productInfoList-reset">重置</a-button>
+              <a-button
+                style="margin-left: 5px"
+                type="primary"
+                class="button-warning"
+                @click="handleExport"
+                :disabled="disabled"
+                v-if="$hasPermissions('B_productLaunchInfoExoprt')"
+                id="productInfoList-export">导出</a-button>
               <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>
@@ -88,13 +96,14 @@
 </template>
 <script>
 import { commonMixin } from '@/utils/mixin'
-import { queryNewProductPage, queryOnlinePageList } from '@/api/product'
+import { queryNewProductPage, queryOnlinePageList, productLogExportExcel } from '@/api/product'
 import { STable, VSelect } from '@/components'
 import ProductBrand from '@/views/common/productBrand.js'
 import productTypeAll from '@/views/common/productTypeAll.js'
 import rangeDate from '@/views/common/rangeDate.vue'
 import moment from 'moment'
 import getDate from '@/libs/getDate.js'
+import { hdExportExcel } from '@/libs/exportExcel'
 export default {
   name: 'NewProductList',
   mixins: [commonMixin],
@@ -119,7 +128,6 @@ export default {
         enabledFlag: undefined //  状态
       },
       disabled: false, //  查询、重置按钮是否可操作
-      exportLoading: false, // 导出loading
       time: [
         moment(getDate.getCurrMonthDays().starttime, 'YYYY-MM-DD'),
         moment(getDate.getCurrMonthDays().endtime, 'YYYY-MM-DD')
@@ -210,6 +218,17 @@ export default {
       this.queryParam.productTypeSn2 = val[1] ? val[1] : ''
       this.queryParam.productTypeSn3 = val[2] ? val[2] : ''
     },
+    //  导出
+    handleExport () {
+      const _this = this
+      const params = _this.queryParam
+      _this.spinning = true
+      _this.disabled = true
+      hdExportExcel(productLogExportExcel, params, '产品上线信息', function () {
+        _this.disabled = false
+        _this.spinning = false
+      })
+    },
     pageInit () {
       const _this = this
       this.$nextTick(() => { // 页面渲染完成后的回调

+ 1 - 1
src/views/productManagement/productInfo/edit.vue

@@ -98,7 +98,7 @@
                   v-model="form.packQty"
                   :precision="0"
                   :min="1"
-                  :max="999999"
+                  :max="99999999"
                   placeholder="请输入"
                 />
                 <span style="margin: 0 5px;">/</span>

+ 9 - 4
src/views/productManagement/productPricing/auditModal.vue

@@ -51,8 +51,8 @@
           <a-descriptions-item label="变更原因">{{ detailsData && detailsData.changeReason || '--' }}</a-descriptions-item>
         </a-descriptions>
         <div class="btn-cont">
-          <a-button id="productPricingAudit-back" @click="isShow = false" style="margin-right: 15px;">取消</a-button>
-          <a-button type="primary" id="productPricingAudit-save" @click="handleAudit">审核通过</a-button>
+          <a-button type="primary" id="productPricingAudit-back" @click="handleAudit('AUDIT_REJECT')" style="margin-right: 15px;">审核不通过</a-button>
+          <a-button type="primary" class="button-info" id="productPricingAudit-save" @click="handleAudit('PRICED')">审核通过</a-button>
         </div>
       </div>
     </a-spin>
@@ -94,9 +94,14 @@ export default {
       })
     },
     // 审核
-    handleAudit () {
+    handleAudit (type) {
+      const ajaxData = {
+        id: this.detailsData.id,
+        productSn: this.detailsData.productSn,
+        auditState: type
+      }
       this.spinning = true
-      productPricingAudit(this.detailsData).then(res => {
+      productPricingAudit(ajaxData).then(res => {
         if (res.status == 200) {
           this.isShow = false
           this.$emit('ok')

+ 5 - 5
src/views/productManagement/productPricing/editModal.vue

@@ -31,7 +31,7 @@
               v-model="form.afterProvincePrice"
               :precision="2"
               :min="0.01"
-              :max="999999"
+              :max="99999999"
               placeholder="请输入省级价"
               ref="afterProvincePrice"
               @keydown.enter.native="nextFocus('afterProvincePrice', 'afterCityPrice', $event)"
@@ -43,7 +43,7 @@
               v-model="form.afterCityPrice"
               :precision="2"
               :min="0.01"
-              :max="999999"
+              :max="99999999"
               placeholder="请输入市级价"
               ref="afterCityPrice"
               @keydown.enter.native="nextFocus('afterCityPrice', 'afterSpecialPrice', $event)"
@@ -55,7 +55,7 @@
               v-model="form.afterSpecialPrice"
               :precision="2"
               :min="0.01"
-              :max="999999"
+              :max="99999999"
               placeholder="请输入特约价"
               ref="afterSpecialPrice"
               @keydown.enter.native="nextFocus('afterSpecialPrice', 'afterTerminalPrice', $event)"
@@ -67,7 +67,7 @@
               v-model="form.afterTerminalPrice"
               :precision="2"
               :min="0.01"
-              :max="999999"
+              :max="99999999"
               placeholder="请输入终端价"
               ref="afterTerminalPrice"
               @keydown.enter.native="nextFocus('afterTerminalPrice', 'afterCarOwnersPrice', $event)"
@@ -79,7 +79,7 @@
               v-model="form.afterCarOwnersPrice"
               :precision="2"
               :min="0.01"
-              :max="999999"
+              :max="99999999"
               placeholder="请输入车主价"
               ref="afterCarOwnersPrice"
               @keydown.enter.native="nextFocus('afterCarOwnersPrice', 'changeReason', $event, 'vSelect')"

+ 59 - 27
src/views/productManagement/productPricing/list.vue

@@ -67,7 +67,7 @@
             id="productPricingList-add"
             @click="openGuideModal=true"
             type="primary"
-            >定价导入</a-button>
+          >定价导入</a-button>
           <a-button
             id="productPricingList-batchAudit"
             type="primary"
@@ -130,9 +130,38 @@
       <!-- 编辑价格 -->
       <product-pricing-edit-modal v-drag :openModal="openModal" :itemSn="itemSn" @close="closeModal" @ok="$refs.table.refresh()" />
       <!-- 审核价格 -->
-      <product-pricing-audit-modal v-drag :openModal="openAuditModal" :itemSn="itemSn" @close="closeAuditModal" @ok="auditSuccess" />
+      <product-pricing-audit-modal v-drag :openModal="openPriceAuditModal" :itemSn="itemSn" @close="closeAuditModal" @ok="auditSuccess" />
       <!-- 导入产品 -->
       <importGuideModal :openModal="openGuideModal" @close="openGuideModal=false" @ok="hanldeOk" />
+      <!-- 审核弹窗 -->
+      <a-modal
+        closable
+        v-model="openAuditModal"
+        :footer="null"
+        width="416px"
+        centered>
+        <div style="display:flex;margin:30px 0 20px 20px;">
+          <a-icon type="question-circle" :style="{fontSize:'23px',color:'#faad14'}"/>
+          <div style="margin-left:10px;">
+            <p style="font-size:16px;font-wight:bold;">提示</p>
+            <p>确认要审核吗?</p>
+          </div>
+        </div>
+        <!-- 按钮 -->
+        <div style="text-align: right;">
+          <a-button
+            id="auditModal-cancel"
+            type="primary"
+            @click="handleAuditModal('AUDIT_REJECT')"
+            style="margin-right: 15px;">审核不通过</a-button>
+          <a-button
+            type="primary"
+            id="auditModal-save"
+            class="button-info"
+            @click="handleAuditModal('PRICED')"
+          >审核通过</a-button>
+        </div>
+      </a-modal>
     </a-card>
   </div>
 </template>
@@ -194,6 +223,7 @@ export default {
       total: 0, // 合计
       openModal: false, //  编辑  弹框
       openAuditModal: false, //  审核  弹框
+      openPriceAuditModal: false,
       itemSn: '', //  当前产品sn
       rowSelectionInfo: null
     }
@@ -261,7 +291,7 @@ export default {
     // 审核
     handleAudit (row) {
       this.itemSn = row.productSn
-      this.openAuditModal = true
+      this.openPriceAuditModal = true
     },
     auditSuccess () {
       this.$refs.table.clearSelected() // 清空表格选中项
@@ -274,29 +304,7 @@ export default {
         _this.$message.warning('请先选择产品!')
         return
       }
-      const obj = []
-      _this.rowSelectionInfo && _this.rowSelectionInfo.selectedRows.map(item => {
-        obj.push(item.productSn)
-      })
-
-      this.$confirm({
-        title: '提示',
-        content: '确认要审核通过吗?',
-        centered: true,
-        onOk () {
-          _this.spinning = true
-          batchAuditPrice(obj).then(res => {
-            if (res.status == 200) {
-              _this.$refs.table.clearSelected() // 清空表格选中项
-              _this.$message.success(res.message)
-              _this.$refs.table.refresh()
-              _this.spinning = false
-            } else {
-              _this.spinning = false
-            }
-          })
-        }
-      })
+      _this.openAuditModal = true
     },
     // 导入产品
     hanldeOk (obj) {
@@ -328,7 +336,7 @@ export default {
     //  关闭审核弹框
     closeAuditModal () {
       this.itemSn = ''
-      this.openAuditModal = false
+      this.openPriceAuditModal = false
     },
     //  产品分类  change
     changeProductType (val, opt) {
@@ -345,6 +353,30 @@ export default {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 240
+    },
+    // 批量审核
+    handleAuditModal (type) {
+      const _this = this
+      const productSnList = []
+      _this.rowSelectionInfo && _this.rowSelectionInfo.selectedRows.map(item => {
+        productSnList.push(item.productSn)
+      })
+      const ajaxData = {
+        productSnList: productSnList,
+        auditState: type
+      }
+      _this.spinning = true
+      batchAuditPrice(ajaxData).then(res => {
+        if (res.status == 200) {
+          _this.$refs.table.clearSelected() // 清空表格选中项
+          _this.$message.success(res.message)
+          _this.$refs.table.refresh()
+          _this.spinning = false
+          _this.openAuditModal = false
+        } else {
+          _this.spinning = false
+        }
+      })
     }
   },
   watch: {

+ 2 - 2
src/views/promotionRulesManagement/dealerPromotions/addModal.vue

@@ -77,7 +77,7 @@
             v-model="form.minOrderAmount"
             :min="0"
             :step="1"
-            :max="999999"
+            :max="99999999"
             :precision="2"
             placeholder="请输入金额"/>
         </a-form-model-item>
@@ -96,7 +96,7 @@
             v-model="form.upperLimitAmount"
             :min="0"
             :step="1"
-            :max="999999"
+            :max="99999999"
             :precision="2"
             placeholder="请输入金额"/>
         </a-form-model-item>

+ 4 - 4
src/views/promotionRulesManagement/dealerPromotions/sendAmountModal.vue

@@ -84,7 +84,7 @@
             <a-input-number
               v-model="fullGiftRuleList[0].regularValue"
               @blur="calculatePrice"
-              :max="999999"
+              :max="99999999"
               :step="1"
               :precision="form.regularUnit==='YUAN'?2:0"
               :min="0"
@@ -108,7 +108,7 @@
               @blur="calculatePrice"
               :min="0"
               :step="1"
-              :max="999999"
+              :max="99999999"
               :precision="2"
               size="small"/>
             元<span>({{ form.regularUnit==='YUAN'? scaleNum+'%':'' }}促销品采购额)</span>
@@ -121,7 +121,7 @@
                 v-model="con.regularValue"
                 :min="i!=0?fullGiftRuleList[i-1].regularValue:0"
                 :step="1"
-                :max="999999"
+                :max="99999999"
                 :precision="form.regularUnit==='YUAN'?2:0"
                 size="small"/>
               <a-select
@@ -144,7 +144,7 @@
                 :min="0"
                 :step="1"
                 :precision="2"
-                :max="999999"
+                :max="99999999"
                 size="small"/>
               %为促销品采购额
               <a-button type="link" v-if="i==0&&fullGiftRuleList&&fullGiftRuleList.length<5" class="button-info" @click="addFullGiftRule">+新增</a-button>

+ 7 - 7
src/views/promotionRulesManagement/dealerPromotions/sendProductsModal.vue

@@ -47,19 +47,19 @@
               @change="changeGateTypeFlag"
               allowClear></v-select>
             <div v-if="form.gateType==='RATIO_AMOUNT'">
-              购买门槛产品金额 <a-input-number v-model="form.gateValue" :min="0" :max="999999" :precision="2" size="small"/> %作为配额
+              购买门槛产品金额 <a-input-number v-model="form.gateValue" :min="0" :max="99999999" :precision="2" size="small"/> %作为配额
               <a-tooltip title="如:填写100%,则购买10000元门槛产品,可享受10000配额购买正价产品,根据门槛金额动态调整配额">
                 <a-icon type="question-circle" theme="filled" :style="{ fontSize: '14px', color: 'gray' }"/>
               </a-tooltip>
             </div>
             <div v-if="form.gateType==='MIN_AMOUNT'">
-              购买门槛产品满最低金额 <a-input-number v-model="form.gateValue" :min="0" :max="999999" :precision="2" size="small"/>元,不限制配额。
+              购买门槛产品满最低金额 <a-input-number v-model="form.gateValue" :min="0" :max="99999999" :precision="2" size="small"/>元,不限制配额。
             </div>
             <div class="ruleDescList" v-if="form.gateType==='FIXED_AMOUNT'">
               购买满
-              <a-input-number v-model="form.gateValue" :min="0" :max="999999" :precision="2" size="small"/>
+              <a-input-number v-model="form.gateValue" :min="0" :max="99999999" :precision="2" size="small"/>
               元门槛产品,可使用
-              <a-input-number v-model="form.quotaAmount" :min="0" :max="999999" :precision="2" size="small"/>
+              <a-input-number v-model="form.quotaAmount" :min="0" :max="99999999" :precision="2" size="small"/>
               元配额,采购规则中的正价商品(配额算销售额)
             </div>
           </div>
@@ -88,7 +88,7 @@
                 v-model="con.regularValue"
                 :min="i!=0?fullGiftRuleList[i-1].regularValue:0"
                 :step="1"
-                :max="999999"
+                :max="99999999"
                 :precision="form.regularUnit==='YUAN'?2:0"
                 size="small"/>
               <a-select
@@ -111,7 +111,7 @@
                 :min="0"
                 :step="1"
                 :precision="0"
-                :max="999999"
+                :max="99999999"
                 size="small"/>
               个促销产品
               <a-button type="link" v-if="i==0&&fullGiftRuleList&&fullGiftRuleList.length<5" class="button-info" @click="addFullGiftRule">+新增</a-button>
@@ -127,7 +127,7 @@
               v-model="form.restrictCategory"
               :min="0"
               :step="1"
-              :max="999999"
+              :max="99999999"
               :precision="0"
               size="small"
               style="margin-right:10px;"/>

+ 10 - 10
src/views/promotionRulesManagement/dealerPromotions/specialOfferModal.vue

@@ -47,17 +47,17 @@
               @change="changeGateTypeFlag"
               allowClear></v-select>
             <div v-if="form.gateType==='RATIO_AMOUNT'">
-              购买门槛产品金额 <a-input-number v-model="form.gateValue" :min="0" :max="999999" :precision="2" size="small"/> %作为配额
+              购买门槛产品金额 <a-input-number v-model="form.gateValue" :min="0" :max="99999999" :precision="2" size="small"/> %作为配额
               <a-tooltip title="如:填写100%,则购买10000元门槛产品,可享受10000配额购买特价产品,根据门槛金额动态调整配额">
                 <a-icon type="question-circle" theme="filled" :style="{ fontSize: '14px', color: 'gray' }"/>
               </a-tooltip>
             </div>
             <div v-if="form.gateType==='MIN_AMOUNT'">
-              购买门槛产品满最低金额 <a-input-number v-model="form.gateValue" :min="0" :max="999999" :precision="2" size="small"/>元,不限制配额。
+              购买门槛产品满最低金额 <a-input-number v-model="form.gateValue" :min="0" :max="99999999" :precision="2" size="small"/>元,不限制配额。
             </div>
             <div class="ruleDescList" v-if="form.gateType==='FIXED_AMOUNT'">
               购买每满
-              <a-input-number v-model="form.gateValue" :max="999999" :min="0" :precision="form.gateUnit=='YUAN'?2:0" size="small"/>
+              <a-input-number v-model="form.gateValue" :max="99999999" :min="0" :precision="form.gateUnit=='YUAN'?2:0" size="small"/>
               <a-select default-value="GE" v-model="form.gateUnit" style="width: 50px;margin-left:5px;" size="small" @change="handleUnit">
                 <a-select-option value="GE">
@@ -67,7 +67,7 @@
                 </a-select-option>
               </a-select>
               门槛产品,可采购
-              <a-input-number v-model="form.quotaAmount" :max="999999" :min="0" :precision="0" size="small"/>
+              <a-input-number v-model="form.quotaAmount" :max="99999999" :min="0" :precision="0" size="small"/>
               个特价产品(配额算销售额)
             </div>
           </div>
@@ -109,7 +109,7 @@
                 :min="0"
                 :step="1"
                 :precision="2"
-                :max="999999"
+                :max="99999999"
                 placeholder="请输入"/>%
             </template>
             <template slot="cityDiscount" slot-scope="text, record">
@@ -119,7 +119,7 @@
                 :min="record.provinceValue||0"
                 :step="1"
                 :precision="2"
-                :max="999999"
+                :max="99999999"
                 placeholder="请输入"/>%
             </template>
             <template slot="specialDiscount" slot-scope="text, record">
@@ -129,7 +129,7 @@
                 :min="record.cityValue ||0"
                 :step="1"
                 :precision="2"
-                :max="999999"
+                :max="99999999"
                 placeholder="请输入"/>%
             </template>
             <template slot="provincePrice" slot-scope="text, record">
@@ -139,7 +139,7 @@
                 :min="0"
                 :step="1"
                 :precision="2"
-                :max="999999"
+                :max="99999999"
                 placeholder="请输入"
                 @blur="handleProvincePrice"/>
             </template>
@@ -150,7 +150,7 @@
                 :min="0"
                 :step="1"
                 :precision="2"
-                :max="999999"
+                :max="99999999"
                 placeholder="请输入"
                 @blur="handleCityPrice"/>
             </template>
@@ -161,7 +161,7 @@
                 :min="0"
                 :step="1"
                 :precision="2"
-                :max="999999"
+                :max="99999999"
                 placeholder="请输入"
                 @blur="handleSpecialPrice"/>
             </template>

+ 1 - 1
src/views/promotionRulesManagement/dealerPromotions/tableType1.vue

@@ -124,7 +124,7 @@
           v-model="record.unitQty"
           :min="0"
           :step="1"
-          :max="999999"
+          :max="99999999"
           :precision="0"
           placeholder="请输入"/>
       </template>

+ 7 - 7
src/views/promotionRulesManagement/dealerPromotions/tableType3.vue

@@ -93,7 +93,7 @@
               :step="1"
               :precision="2"
               placeholder="请输入"
-              :max="999999"
+              :max="99999999"
               @blur="e=>calculatePrice(e.target.value,record.productScopeSn,'province')"/>
           </div>
           <span v-else>--</span>
@@ -118,7 +118,7 @@
               :step="1"
               :precision="2"
               placeholder="请输入"
-              :max="999999"/>%
+              :max="99999999"/>%
           </div>
           <span v-else>{{ (record.provinceDiscountRate||record.provinceDiscountRate==0)?record.provinceDiscountRate+'%':'--' }}</span>
         </div>
@@ -139,7 +139,7 @@
               :step="1"
               :precision="2"
               placeholder="请输入"
-              :max="999999"
+              :max="99999999"
               :disabled="rulesType!='0'"
               @blur="e=>calculatePrice(e.target.value,record.productScopeSn,'city')"/>
           </div>
@@ -165,7 +165,7 @@
               :step="1"
               :precision="2"
               placeholder="请输入"
-              :max="999999"/>%
+              :max="99999999"/>%
           </div>
           <span v-else>{{ (record.cityDiscountRate||record.cityDiscountRate==0)?record.cityDiscountRate+'%':'--' }}</span>
         </div>
@@ -186,7 +186,7 @@
               :step="1"
               :precision="2"
               placeholder="请输入"
-              :max="999999"
+              :max="99999999"
               :disabled="rulesType!='0'"
               @blur="e=>calculatePrice(e.target.value,record.productScopeSn,'special')"/>
           </div>
@@ -212,7 +212,7 @@
               :step="1"
               :precision="2"
               placeholder="请输入"
-              :max="999999"/>%
+              :max="99999999"/>%
           </div>
           <span v-else>{{ (record.specialDiscountRate||record.specialDiscountRate==0) ? record.specialDiscountRate+'%':'--' }}</span>
         </div>
@@ -241,7 +241,7 @@
           :min="0"
           :step="1"
           :precision="0"
-          :max="999999"
+          :max="99999999"
           placeholder="请输入"/>
       </template>
       <span slot="action" slot-scope="text,record">

+ 3 - 3
src/views/promotionRulesManagement/promotionRules/basicInfoModal.vue

@@ -96,7 +96,7 @@
                 id="promotionRules-basicInfo-activeAmount"
                 v-model="form.activeAmount"
                 :min="1"
-                :max="999999"
+                :max="99999999"
                 :precision="2"
                 style="width: 85%;margin-right: 5px;"
                 placeholder="请输入活动经费上限(1~999999)"
@@ -131,10 +131,10 @@
                 id="promotionRules-basicInfo-orderAmount"
                 v-model="form.orderAmount"
                 :min="1"
-                :max="999999"
+                :max="99999999"
                 :precision="2"
                 style="width: 85%;margin-right: 5px;"
-                placeholder="请输入订单起订金额(1~999999)"
+                placeholder="请输入订单起订金额(1~99999999)"
                 allowClear />
               <span>万元</span>
             </a-form-model-item>

+ 6 - 6
src/views/promotionRulesManagement/promotionRules/editRuleModal.vue

@@ -37,7 +37,7 @@
                 v-model="form.orderGoodsQty"
                 :precision="0"
                 :min="1"
-                :max="999999"
+                :max="99999999"
                 placeholder="请输入数量"
                 style="width: 100%;" />
             </a-form-model-item>
@@ -48,7 +48,7 @@
                 v-model="form.promoQty"
                 :precision="0"
                 :min="1"
-                :max="999999"
+                :max="99999999"
                 placeholder="请输入数量"
                 style="width: 100%;" />
             </a-form-model-item>
@@ -73,7 +73,7 @@
                     v-model="form.orderAmounts"
                     :precision="2"
                     :min="0.1"
-                    :max="999999"
+                    :max="99999999"
                     placeholder="请输入金额"
                     style="width: 100%;" />
                 </a-form-model-item>
@@ -84,7 +84,7 @@
                     v-model="form.promoAmount"
                     :precision="2"
                     :min="0.1"
-                    :max="999999"
+                    :max="99999999"
                     placeholder="请输入金额"
                     style="width: 100%;" />
                 </a-form-model-item>
@@ -98,7 +98,7 @@
                     v-model="form.orderAmount"
                     :precision="2"
                     :min="0.1"
-                    :max="999999"
+                    :max="99999999"
                     placeholder="请输入金额"
                     style="width: 100%;" />
                 </a-form-model-item>
@@ -139,7 +139,7 @@
               v-model="form.orderGoodsQty"
               :precision="0"
               :min="1"
-              :max="999999"
+              :max="99999999"
               placeholder="请输入数量"
               style="width: 30%;" />
             个正价产品,可以以换购价购买任意1个换购产品

+ 1 - 1
src/views/purchasingManagement/bulkWarehousingOrder/productModal.vue

@@ -64,7 +64,7 @@
             v-model="form.productQty"
             :precision="0"
             :min="1"
-            :max="999999"
+            :max="99999999"
             placeholder="请输入"
             style="width: 50%;margin-right:20px;" /><span>个</span>
         </a-form-model-item>

+ 18 - 5
src/views/purchasingManagement/purchaseReturn/addModal.vue

@@ -37,6 +37,16 @@
             placeholder="请选择退货仓库"
           />
         </a-form-model-item>
+        <a-form-model-item label="是否抓单" prop="grabFlag">
+          <a-radio-group v-model="form.grabFlag" :disabled="itemSn?true:false">
+            <a-radio :value="1">
+              是
+            </a-radio>
+            <a-radio :value="0">
+              否
+            </a-radio>
+          </a-radio-group>
+        </a-form-model-item>
         <a-form-model-item label="补充说明" prop="explainInfo">
           <a-textarea
             id="purchaseReturn"
@@ -101,7 +111,8 @@ export default {
         returnReason: '', // 退货原因
         explainInfo: '', // 补充说明
         warehouseSn: undefined,
-        attachmentList: ''
+        attachmentList: '',
+        grabFlag: 1
       },
       attachList: [], // 附件
       rules: {
@@ -112,6 +123,7 @@ export default {
           { required: true, message: '请选择退货原因', trigger: 'change' }
         ],
         warehouseSn: [{ required: true, message: '请选择退货仓库', trigger: 'change' }],
+        grabFlag: [{ required: true, message: '请选择是否抓单', trigger: 'change' }]
       },
       attachAction: process.env.VUE_APP_API_BASE_URL + '/uploadGetFileInfo'
     }
@@ -160,7 +172,8 @@ export default {
             returnReason: resultObj.returnReason, // 退货原因
             explainInfo: resultObj.explainInfo, // 补充说明
             warehouseSn: resultObj.warehouseSn,
-            sparePartsReturnSn: this.itemSn
+            sparePartsReturnSn: this.itemSn,
+            grabFlag: Number(resultObj.grabFlag)
           }
           this.$nextTick(() => {
             this.$refs.attachList.setFileList(this.attachList)
@@ -190,9 +203,9 @@ export default {
       } else {
         if (this.itemSn) {
           this.getDetail()
-        }else{
+        } else {
           // 默认仓库
-          this.form.warehouseSn = this.isShowWarehouse ? undefined : this.defWarehouse&&this.defWarehouse.warehouseSn
+          this.form.warehouseSn = this.isShowWarehouse ? undefined : this.defWarehouse && this.defWarehouse.warehouseSn
         }
       }
     }
@@ -209,7 +222,7 @@ export default {
       text-align: center;
       margin: 35px 0 10px;
     }
-    .ant-form-item:nth-child(4){
+    .ant-form-item:nth-child(5){
       margin-bottom: 0px !important;
     }
   }

+ 21 - 20
src/views/purchasingManagement/purchaseReturn/detailModal.vue

@@ -15,25 +15,26 @@
           <template slot="header">
             基础信息
           </template>
-           <a-descriptions size="small" :column="3" style="margin-bottom: 10px;">
-             <a-descriptions-item label="采购退货单号">{{ detailsData&&detailsData.sparePartsReturnNo || '--' }}</a-descriptions-item>
-             <a-descriptions-item label="供应商名称">{{ detailsData&&detailsData.supplier&&detailsData.supplier.supplierName || '--' }}</a-descriptions-item>
-             <a-descriptions-item label="退货原因">{{ detailsData&&detailsData.returnReasonDictValue || '--' }}</a-descriptions-item>
-             <a-descriptions-item label="退货仓库">{{ detailsData&&detailsData.warehouseName || '--' }}</a-descriptions-item>
-             <a-descriptions-item label="创建时间">{{ detailsData&&detailsData.createDate || '--' }}</a-descriptions-item>
-             <a-descriptions-item label="出库时间" v-if="detailsData&&detailsData.state!='AUDIT_REJECT'">{{ detailsData&&detailsData.auditDate || '--' }}</a-descriptions-item>
-             <a-descriptions-item label="出库时间" v-else>--</a-descriptions-item>
-             <a-descriptions-item label="业务状态">{{ detailsData&&detailsData.stateDictValue || '--' }}</a-descriptions-item>
-             <a-descriptions-item label="补充说明" :span="3">{{ detailsData&&detailsData.explainInfo || '--' }}</a-descriptions-item>
-             <a-descriptions-item label="附件" :span="3">
-               <span v-if="detailsData&&detailsData.attachmentList&&detailsData.attachmentList.length>0">
-                 <a target="_blank" style="color: #00aaff;text-decoration: underline;margin-right: 15px;" :href="item.filePath" v-for="item in detailsData.attachmentList" :key="item.id">
-                   {{ item.fileName }}
-                 </a>
-               </span>
-               <span v-else>--</span>
-             </a-descriptions-item>
-           </a-descriptions>
+          <a-descriptions size="small" :column="4" style="margin-bottom: 10px;">
+            <a-descriptions-item label="采购退货单号">{{ detailsData&&detailsData.sparePartsReturnNo || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="供应商名称">{{ detailsData&&detailsData.supplier&&detailsData.supplier.supplierName || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="退货原因">{{ detailsData&&detailsData.returnReasonDictValue || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="退货仓库">{{ detailsData&&detailsData.warehouseName || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="创建时间">{{ detailsData&&detailsData.createDate || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="出库时间" v-if="detailsData&&detailsData.state!='AUDIT_REJECT'">{{ detailsData&&detailsData.auditDate || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="出库时间" v-else>--</a-descriptions-item>
+            <a-descriptions-item label="业务状态">{{ detailsData&&detailsData.stateDictValue || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="是否抓单">{{ detailsData&&detailsData.grabFlag =='0'?'否':'是' }}</a-descriptions-item>
+            <a-descriptions-item label="补充说明" :span="4">{{ detailsData&&detailsData.explainInfo || '--' }}</a-descriptions-item>
+            <a-descriptions-item label="附件" :span="4">
+              <span v-if="detailsData&&detailsData.attachmentList&&detailsData.attachmentList.length>0">
+                <a target="_blank" style="color: #00aaff;text-decoration: underline;margin-right: 15px;" :href="item.filePath" v-for="item in detailsData.attachmentList" :key="item.id">
+                  {{ item.fileName }}
+                </a>
+              </span>
+              <span v-else>--</span>
+            </a-descriptions-item>
+          </a-descriptions>
         </a-collapse-panel>
       </a-collapse>
       <a-alert type="info" style="margin-bottom:10px">
@@ -165,7 +166,7 @@ export default {
         this.$store.state.app.curActionPermission = 'B_purchaseReturnDetail'
         this.getStatisticsData()
         this.getBasicsInfo()
-        this.$nextTick(()=>{
+        this.$nextTick(() => {
           this.$refs.tableDetail.refresh(true)
         })
       }

+ 100 - 96
src/views/purchasingManagement/purchaseReturn/list.vue

@@ -20,19 +20,19 @@
                 <supplier v-model="queryParam.supplierSn" isPermission placeholder="请输入供应商名称"></supplier>
               </a-form-item>
             </a-col>
-          <template v-if="advanced">
-            <a-col :md="6" :sm="24">
-              <a-form-item label="退货原因">
-                <v-select
-                  v-model="queryParam.returnReason"
-                  ref="returnReason"
-                  id="purchaseReturn-returnReason"
-                  code="SPARE_PARTS_RETURN_REASON"
-                  placeholder="请选择退货原因"
-                  allowClear></v-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24" v-show="isShowWarehouse">
+            <template v-if="advanced">
+              <a-col :md="6" :sm="24">
+                <a-form-item label="退货原因">
+                  <v-select
+                    v-model="queryParam.returnReason"
+                    ref="returnReason"
+                    id="purchaseReturn-returnReason"
+                    code="SPARE_PARTS_RETURN_REASON"
+                    placeholder="请选择退货原因"
+                    allowClear></v-select>
+                </a-form-item>
+              </a-col>
+              <a-col :md="6" :sm="24" v-show="isShowWarehouse">
                 <a-form-item label="退货仓库">
                   <warehouse
                     v-model="queryParam.warehouseSn"
@@ -42,18 +42,18 @@
                   />
                 </a-form-item>
               </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="业务状态">
-                <v-select
-                  v-model="queryParam.state"
-                  ref="state"
-                  id="purchaseReturn-state"
-                  code="SPARE_PARTS_RETURN_STATE"
-                  placeholder="请选择审核状态"
-                  allowClear
-                ></v-select>
-              </a-form-item>
-            </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="业务状态">
+                  <v-select
+                    v-model="queryParam.state"
+                    ref="state"
+                    id="purchaseReturn-state"
+                    code="SPARE_PARTS_RETURN_STATE"
+                    placeholder="请选择审核状态"
+                    allowClear
+                  ></v-select>
+                </a-form-item>
+              </a-col>
             </template>
             <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
@@ -78,11 +78,11 @@
         </a-form>
       </div>
     </a-card>
-  <a-card size="small" :bordered="false" class="bulkWarehousingOrderList-wrap">
-    <a-spin :spinning="spinning" tip="Loading...">
-      <!-- 操作按钮 -->
-      <div class="table-operator">
-        <a-button v-if="$hasPermissions('B_purchaseReturnAdd')" id="bulkWarehousingOrderList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
+    <a-card size="small" :bordered="false" class="bulkWarehousingOrderList-wrap">
+      <a-spin :spinning="spinning" tip="Loading...">
+        <!-- 操作按钮 -->
+        <div class="table-operator">
+          <a-button v-if="$hasPermissions('B_purchaseReturnAdd')" id="bulkWarehousingOrderList-add" type="primary" class="button-error" @click="handleAdd">新增</a-button>
         <!-- <a-button
           style="margin-left: 10px"
           type="primary"
@@ -91,74 +91,74 @@
           :disabled="disabled"
           :loading="exportLoading"
         >同步到ERP</a-button> -->
-      </div>
-      <!-- 列表 -->
-      <s-table
-        class="sTable fixPagination"
-        ref="table"
-        :style="{ height: tableHeight+70+'px' }"
-        size="small"
-        :rowKey="(record) => record.sparePartsReturnNo"
-        :columns="columns"
-        :data="loadData"
-        :pageSize="30"
-        :scroll="{ y: tableHeight }"
-        :defaultLoadData="false"
-        bordered>
-        <!-- 采购退货单号 -->
-        <template slot="sparePartsReturnNo" slot-scope="text, record">
-          <span v-if="$hasPermissions('B_purchaseReturnDetail')" class="link-bule" @click="handleDetail(record)">{{ record.sparePartsReturnNo }}</span>
-          <span v-else>{{ record.sparePartsReturnNo }}</span>
-        </template>
-        <!-- 操作 -->
-        <!-- state 待提交 WAIT_SUBMIT 待审核 WAIT_AUDIT 已完结 FINISH 审核不通过 AUDIT_REJECT -->
-        <template slot="action" slot-scope="text, record">
-          <a-button
-            size="small"
-            type="link"
-            v-if="$hasPermissions('B_purchaseReturnEdit') && record.state == 'WAIT_SUBMIT'"
-            @click="handleEdit(record)"
-            class="button-info"
-            id="bulkWarehousingOrderList-edit-btn">编辑</a-button>
-          <a-button
-            size="small"
-            type="link"
-            class="button-warning"
-            @click="handleSH(record)"
-            v-if="$hasPermissions('B_purchaseReturnRate') && record.state !='WAIT_SUBMIT'"
-            id="allocateBillList-examine-btn">审核进度</a-button>
-          <!-- <a-button
+        </div>
+        <!-- 列表 -->
+        <s-table
+          class="sTable fixPagination"
+          ref="table"
+          :style="{ height: tableHeight+70+'px' }"
+          size="small"
+          :rowKey="(record) => record.sparePartsReturnNo"
+          :columns="columns"
+          :data="loadData"
+          :pageSize="30"
+          :scroll="{ y: tableHeight }"
+          :defaultLoadData="false"
+          bordered>
+          <!-- 采购退货单号 -->
+          <template slot="sparePartsReturnNo" slot-scope="text, record">
+            <span v-if="$hasPermissions('B_purchaseReturnDetail')" class="link-bule" @click="handleDetail(record)">{{ record.sparePartsReturnNo }}</span>
+            <span v-else>{{ record.sparePartsReturnNo }}</span>
+          </template>
+          <!-- 操作 -->
+          <!-- state 待提交 WAIT_SUBMIT 待审核 WAIT_AUDIT 已完结 FINISH 审核不通过 AUDIT_REJECT -->
+          <template slot="action" slot-scope="text, record">
+            <a-button
+              size="small"
+              type="link"
+              v-if="$hasPermissions('B_purchaseReturnEdit') && record.state == 'WAIT_SUBMIT'"
+              @click="handleEdit(record)"
+              class="button-info"
+              id="bulkWarehousingOrderList-edit-btn">编辑</a-button>
+            <a-button
+              size="small"
+              type="link"
+              class="button-warning"
+              @click="handleSH(record)"
+              v-if="$hasPermissions('B_purchaseReturnRate') && record.state !='WAIT_SUBMIT'"
+              id="allocateBillList-examine-btn">审核进度</a-button>
+            <!-- <a-button
             size="small"
             type="link"
             v-if="record.state == 'FINISH'"
             @click="handleEdit(record)"
             class="button-info"
             id="bulkWarehousingOrderList-edit-btn">同步到ERP</a-button> -->
-          <a-button
-            size="small"
-            type="link"
-            v-if="$hasPermissions('B_purchaseReturnSubmit') && record.state == 'AUDIT_REJECT'"
-            @click="handleResubmit(record)"
-            class="button-info"
-            id="bulkWarehousingOrderList-edit-btn">再次提交</a-button>
-          <a-button
-            size="small"
-            type="link"
-            v-if="$hasPermissions('B_purchaseReturnDel') && record.state == 'WAIT_SUBMIT'"
-            @click="handleDel(record)"
-            class="button-error"
-            id="bulkWarehousingOrderList-del-btn">删除</a-button>
-        </template>
-      </s-table>
-    </a-spin>
-    <!-- 新增、详情弹窗-->
-    <add-modal v-drag :openModal="openModal" @ok="handleOk" @close="openModal=false" />
-    <detailModal v-drag :openModal="openDetailModal" :itemSn="itemSn" @close="closeDetailModal" />
-    <!-- 导出提示框 -->
-    <reportModal :visible="showExport" @close="showExport=false"></reportModal>
-    <!-- 审核进度弹窗 -->
-    <reviewProgressModal v-drag :itemSn="itemSnSh" :auditTime="auditTime" :openModal="openReviewModal" @close="openReviewModal=false"></reviewProgressModal>
-  </a-card>
+            <a-button
+              size="small"
+              type="link"
+              v-if="$hasPermissions('B_purchaseReturnSubmit') && record.state == 'AUDIT_REJECT'"
+              @click="handleResubmit(record)"
+              class="button-info"
+              id="bulkWarehousingOrderList-edit-btn">再次提交</a-button>
+            <a-button
+              size="small"
+              type="link"
+              v-if="$hasPermissions('B_purchaseReturnDel') && record.state == 'WAIT_SUBMIT'"
+              @click="handleDel(record)"
+              class="button-error"
+              id="bulkWarehousingOrderList-del-btn">删除</a-button>
+          </template>
+        </s-table>
+      </a-spin>
+      <!-- 新增、详情弹窗-->
+      <add-modal v-drag :openModal="openModal" @ok="handleOk" @close="openModal=false" />
+      <detailModal v-drag :openModal="openDetailModal" :itemSn="itemSn" @close="closeDetailModal" />
+      <!-- 导出提示框 -->
+      <reportModal :visible="showExport" @close="showExport=false"></reportModal>
+      <!-- 审核进度弹窗 -->
+      <reviewProgressModal v-drag :itemSn="itemSnSh" :auditTime="auditTime" :openModal="openReviewModal" @close="openReviewModal=false"></reviewProgressModal>
+    </a-card>
   </div>
 </template>
 
@@ -225,7 +225,7 @@ export default {
   },
   computed: {
     columns () {
-      let _this=this
+      const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -237,8 +237,8 @@ export default {
         { title: '审核状态', dataIndex: 'stateDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
-      if(this.isShowWarehouse){
-        arr.splice(5,0,{ title: '退货仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },)
+      if (this.isShowWarehouse) {
+        arr.splice(5, 0, { title: '退货仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } })
       }
       if (this.$hasPermissions('M_purchaseReturnList_costPrice')) { //  售价权限
         arr.splice(7, 0, { title: '退货金额', dataIndex: 'totalCost', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })
@@ -275,7 +275,11 @@ export default {
     },
     //  编辑
     handleEdit (row) {
-      this.$router.push({ name: 'purchaseReturnEdit', query: { returnSn: row.sparePartsReturnSn, no: row.sparePartsReturnNo, sn: row.supplierSn } })
+      if (row.grabFlag == 0) {
+        this.$router.push({ name: 'purchaseReturnEdit', query: { returnSn: row.sparePartsReturnSn, no: row.sparePartsReturnNo, sn: row.supplierSn } })
+      } else {
+        this.$router.push({ name: 'purchaseReturnEditGrab', query: { returnSn: row.sparePartsReturnSn, no: row.sparePartsReturnNo, sn: row.supplierSn } })
+      }
     },
     // 审核进度
     handleSH (row) {

+ 37 - 27
src/views/purchasingManagement/purchaseReturn/purchaseReturnDeatil.vue

@@ -22,30 +22,36 @@
             <a-icon type="edit" /> 编辑基础信息
           </div>
         </div>
-         <a-descriptions size="small" :column="4" style="margin-bottom: 10px;">
-           <a-descriptions-item label="采购退货单号">{{ (detailsData && detailsData.sparePartsReturnNo) || '--' }}</a-descriptions-item>
-           <a-descriptions-item label="供应商名称">{{ (detailsData && detailsData.supplier && detailsData.supplier.supplierName) || '--' }}</a-descriptions-item>
-           <a-descriptions-item label="退货原因">{{ (detailsData && detailsData.returnReasonDictValue) || '--' }}</a-descriptions-item>
-           <a-descriptions-item label="退货仓库">{{ detailsData&&detailsData.warehouseName || '--' }}</a-descriptions-item>
-           <a-descriptions-item label="补充说明">{{ (detailsData && detailsData.explainInfo) || '--' }}</a-descriptions-item>
-           <a-descriptions-item label="附件" :span="3">
-             <span v-if="detailsData && detailsData.attachmentList && detailsData.attachmentList.length > 0">
-               <a
-                 target="_blank"
-                 style="color: #00aaff;text-decoration: underline;margin-right: 15px;"
-                 :href="item.filePath"
-                 v-for="item in detailsData.attachmentList"
-                 :key="item.id"
-               >
-                 {{ item.fileName }}
-               </a>
-             </span>
-             <span v-else>--</span>
-           </a-descriptions-item>
-         </a-descriptions>
+        <a-descriptions size="small" :column="4" style="margin-bottom: 10px;">
+          <a-descriptions-item label="采购退货单号">{{ (detailsData && detailsData.sparePartsReturnNo) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="供应商名称">{{ (detailsData && detailsData.supplier && detailsData.supplier.supplierName) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="退货原因">{{ (detailsData && detailsData.returnReasonDictValue) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="退货仓库">{{ detailsData&&detailsData.warehouseName || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="是否抓单">{{ detailsData&&detailsData.grabFlag =='0'?'否':'是' }}</a-descriptions-item>
+          <a-descriptions-item label="补充说明">{{ (detailsData && detailsData.explainInfo) || '--' }}</a-descriptions-item>
+          <a-descriptions-item label="附件" :span="2">
+            <span v-if="detailsData && detailsData.attachmentList && detailsData.attachmentList.length > 0">
+              <a
+                target="_blank"
+                style="color: #00aaff;text-decoration: underline;margin-right: 15px;"
+                :href="item.filePath"
+                v-for="item in detailsData.attachmentList"
+                :key="item.id"
+              >
+                {{ item.fileName }}
+              </a>
+            </span>
+            <span v-else>--</span>
+          </a-descriptions-item>
+        </a-descriptions>
       </a-card>
       <a-card size="small" :bordered="false" class="salesReturnEdit-cont">
-        <queryPart ref="partQuery" :newLoading="isInster" :addMoreLoading="addMoreLoading" @add="saveProduct" @bachAdd="saveMoreProduct"></queryPart>
+        <queryPart
+          ref="partQuery"
+          :newLoading="isInster"
+          :addMoreLoading="addMoreLoading"
+          @add="saveProduct"
+          @bachAdd="saveMoreProduct"></queryPart>
       </a-card>
       <a-card size="small" :bordered="false" class="salesReturnEdit-cont">
         <a-alert style="margin-bottom: 10px;" type="info">
@@ -82,7 +88,7 @@
           class="sTable"
           ref="table"
           size="small"
-          :rowKey="(record,index) => index"
+          :rowKey="(record) => record.id"
           :columns="columns"
           :data="loadData"
           :defaultLoadData="false"
@@ -176,7 +182,7 @@ export default {
       chooseList: [],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
-        this.productForm.sparePartsReturnSn = this.$route.query.returnSn
+        this.productForm.sparePartsReturnSn = this.sparePartsReturnSn
         return sparePartsReturnQueryPage(Object.assign(parameter, this.productForm)).then(res => {
           let data
           if (res.status == 200) {
@@ -193,7 +199,8 @@ export default {
       openModal: false, // 修改信息弹窗
       statisticsObj: null, // 统计明细
       detailsData: null, // 基础信息数据
-      addMoreLoading: false // 批量添加动画
+      addMoreLoading: false, // 批量添加动画
+      grabFlag: undefined
     }
   },
   computed: {
@@ -465,7 +472,7 @@ export default {
       this.resetSearchForm(true)
     },
     getChooseList () {
-      this.$refs.partQuery.pageInit(this.supplierSn, this.sparePartsReturnSn, this.detailsData?this.detailsData.warehouseSn:undefined)
+      this.$refs.partQuery.pageInit(this.supplierSn, this.sparePartsReturnSn, this.detailsData ? this.detailsData.warehouseSn : undefined, this.detailsData.grabFlag)
     },
     // 获取页面统计数据
     getStatisticsData () {
@@ -490,7 +497,10 @@ export default {
         } else {
           this.detailsData = null
         }
-        this.getChooseList()
+        const _this = this
+        this.$nextTick(() => {
+          _this.getChooseList()
+        })
       })
     }
   },

+ 18 - 10
src/views/purchasingManagement/purchaseReturn/queryPart.vue

@@ -34,9 +34,11 @@
                 <a-button type="primary" style="margin-right: 5px" @click="handleBatchAdd" :loading="addMoreLoading">批量添加</a-button>
                 <span v-if="selNums&&selNums!=0" style="margin:0 10px;">已选中{{ selNums }}项</span>
               </div>
-              <a-checkbox @change="onChange" :checked="isChecked">
-                显示最大可退数量为0的产品
-              </a-checkbox>
+              <div v-if="queryParam.grabFlag==1">
+                <a-checkbox @change="onChange" :checked="isChecked">
+                  显示最大可退数量为0的产品
+                </a-checkbox>
+              </div>
             </a-col>
           </a-row>
         </a-form>
@@ -47,7 +49,7 @@
       class="sTable"
       ref="chooseTable"
       size="small"
-      :rowKey="(record,i) => i"
+      :rowKey="(record) => record.id"
       :row-selection="{ columnWidth: 40,getCheckboxProps: record => ({ props: { disabled: record.currentStockQty == 0 || record.isCheckedFlag} }) }"
       @rowSelection="rowSelectionFun"
       :columns="columns"
@@ -120,7 +122,8 @@ export default {
         endDate: '',
         sparePartsNo: '',
         isZero: 0,
-        createDate: undefined
+        createDate: undefined,
+        grabFlag: ''
       },
       warehousingDate: [], // 入库时间
       rowSelectionInfo: null,
@@ -154,18 +157,22 @@ export default {
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
         { title: '入库单号', dataIndex: 'sparePartsNo', width: '24%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'product.code', width: '24%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'product.name', width: '27%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'product.name', width: '24%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '单位', dataIndex: 'product.unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '批次号', dataIndex: 'sparePartsBatchNo', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '入库数量', dataIndex: 'productQty', width: '9%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
-        { title: '已退数量', dataIndex: 'returnedQty', width: '9%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
+        // { title: '已退数量', dataIndex: 'returnedQty', width: '9%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
         { title: '最大可退数量', dataIndex: 'currentStockQty', width: '9%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
-        { title: '申请退货数量', width: '9%', align: 'center', scopedSlots: { customRender: 'qty' } },
+        { title: '申请退货数量', width: '10%', align: 'center', scopedSlots: { customRender: 'qty' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '10%', align: 'center' }
       ]
       if (this.$hasPermissions('B_purchaseReturnEdit_costPrice')) {
         arr.splice(6, 0, { title: '入库单价', dataIndex: 'productCost', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? toThousands(text, 2) : '--') } })
       }
+      if (this.queryParam.grabFlag == 1) { // 抓单
+        const pos = this.$hasPermissions('B_purchaseReturnEdit_costPrice') ? 8 : 7
+        arr.splice(pos, 0, { title: '已退数量', dataIndex: 'returnedQty', width: '9%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } })
+      }
       return arr
     },
     selNums () {
@@ -192,8 +199,9 @@ export default {
       this.queryParam.beginDate = date[0] ? date[0] : ''
       this.queryParam.endDate = date[1] ? date[1] : ''
     },
-    pageInit (buyerSn, returnSn, warehouseSn) {
+    pageInit (buyerSn, returnSn, warehouseSn, grabFlag) {
       this.buyerSn = buyerSn
+      this.queryParam.grabFlag = grabFlag
       this.warehouseSn = warehouseSn
       this.getRepeatResult(returnSn)
       this.$refs.chooseTable.refresh()
@@ -203,7 +211,7 @@ export default {
     handleAdd (row) {
       const selectArr = this.rowSelectionInfo ? this.rowSelectionInfo.selectedRowKeys : null
       if (selectArr && selectArr.length > 0) {
-        const pot = selectArr.findIndex(item => { return item == row.sparePartsDetailSn })
+        const pot = selectArr.findIndex(item => { return item == row.id })
         selectArr.splice(pot, 1)
         const index = this.rowSelectionInfo.selectedRows.findIndex(item => { return item.sparePartsDetailSn == row.sparePartsDetailSn })
         this.rowSelectionInfo.selectedRows.splice(index, 1)

+ 31 - 12
src/views/reportData/salesDetails/list.vue

@@ -53,11 +53,6 @@
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
-            <a-col :md="6" :sm="24" v-if="isShowCustomerSearch">
-              <a-form-model-item label="品牌分类">
-                <v-select code="BRAND_TYPE" id="salesDetailsList-productBrandTypeSn" v-model="queryParam.productBrandTypeSn" allowClear placeholder="请选择品牌分类"></v-select>
-              </a-form-model-item>
-            </a-col>
             <template v-if="advanced">
               <a-col :md="6" :sm="24" v-if="!isShowCustomerSearch">
                 <a-form-model-item label="品牌分类">
@@ -106,6 +101,27 @@
                   </a-select>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="产品类型" prop="promotionFlag">
+                  <a-select allowClear v-model.trim="queryParam.promotionFlag" :dropdownMatchSelectWidth="false" placeholder="请选择产品类型">
+                    <a-select-option value="0">
+                      正常产品
+                    </a-select-option>
+                    <a-select-option value="REGULAR">
+                      正价产品(活动)
+                    </a-select-option>
+                    <a-select-option value="DISCOUNT">
+                      特价产品
+                    </a-select-option>
+                    <a-select-option value="GIFT">
+                      促销产品
+                    </a-select-option>
+                    <a-select-option value="GATE">
+                      门槛产品
+                    </a-select-option>
+                  </a-select>
+                </a-form-model-item>
+              </a-col>
               <a-col :md="6" :sm="24" v-show="isShowCustomerSearch">
                 <a-form-item label="客服">
                   <customerService ref="customerName" v-model="queryParam.bizUserSn"></customerService>
@@ -113,12 +129,6 @@
               </a-col>
             </template>
             <a-col :md="isShowCustomerSearch?24:6" :sm="24" style="margin-bottom: 10px;" :style="{textAlign: isShowCustomerSearch?'center':''}">
-              <!-- <a-button
-                type="primary"
-                class="button-info"
-                size="small"
-                @click="handleStock"
-                id="salesDetailsList-stockDate">盘点区间日期</a-button> -->
               <a-button style="margin-left: 5px" type="primary" @click="handleSearch" :disabled="disabled" id="salesDetailsList-refresh">查询</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="salesDetailsList-reset">重置</a-button>
               <a-button
@@ -155,6 +165,13 @@
           :scroll="{ x: 2480 , y: tableHeight - 30 }"
           :defaultLoadData="false"
           bordered>
+          <!-- 产品编码 -->
+          <template slot="productCode" slot-scope="text, record">
+            <span style="padding-right: 15px;">{{ text }}</span>
+            <a-badge count="促" v-if="record.promotionFlag=='GIFT'" :number-style="{ backgroundColor: '#52c41a', zoom:'80%' }"></a-badge>
+            <a-badge count="特" v-if="record.promotionFlag=='DISCOUNT'" :number-style="{ backgroundColor: '#faad14', zoom:'80%' }"></a-badge>
+            <a-badge count="槛" v-if="record.promotionFlag=='GATE'" :number-style="{ backgroundColor: '#108ee9', zoom:'80%' }"></a-badge>
+          </template>
           <template slot="footer">
             <a-row :gutter="15">
               <a-col :md="4" :sm="24">下推数量:{{ (totalData && (totalData.qty || totalData.qty==0)) ? totalData.qty : '--' }}</a-col>
@@ -228,6 +245,7 @@ export default {
         dealerCountySn: undefined,
         warehouseSn: undefined,
         giftFLag: undefined,
+        promotionFlag: undefined,
         bizUserSn: undefined // 客服
       },
       productType: [],
@@ -280,7 +298,7 @@ export default {
         { title: '品牌', dataIndex: 'productBrandName', width: 130, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '二级分类', dataIndex: 'productTypeName2', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '产品编码', dataIndex: 'productCode', width: 150, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品编码', dataIndex: 'productCode', width: 150, align: 'center', scopedSlots: { customRender: 'productCode' } },
         { title: '单位', dataIndex: 'productUnit', width: 50, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '下推数量', dataIndex: 'qty', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
         // { title: '成本价', dataIndex: 'totalCost', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -395,6 +413,7 @@ export default {
       this.queryParam.dealerCountySn = undefined
       this.queryParam.warehouseSn = undefined
       this.queryParam.giftFLag = undefined
+      this.queryParam.promotionFlag = undefined
       this.queryParam.bizUserSn = undefined
       if (this.advanced) {
         this.$refs.subarea.clearData()

+ 8 - 0
src/views/salesManagement/outboundOrder/list.vue

@@ -59,6 +59,11 @@
                   <a-input id="outboundOrderList-stockOutNo" v-model.trim="queryParam.stockOutNo" allowClear placeholder="请输入出库单号"/>
                 </a-form-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-item label="备货单号">
+                  <a-input id="outboundOrderList-outBizSubNo" v-model.trim="queryParam.outBizSubNo" allowClear placeholder="请输入备货单号"/>
+                </a-form-item>
+              </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="所在区域">
                   <subarea id="outboundOrderList-subarea" ref="subarea" @change="subareaChange"></subarea>
@@ -226,6 +231,7 @@ export default {
         shippingAddrProvinceSn: undefined,
         sendFlag: undefined,
         warehouseSn: undefined,
+        outBizSubNo: '',
         bizUserSn: undefined
       },
       disabled: false, //  查询、重置按钮是否可操作
@@ -262,6 +268,7 @@ export default {
         { title: '审核时间', dataIndex: 'auditTime', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库单号', scopedSlots: { customRender: 'stockOutNo' }, width: '10%', align: 'center' },
         { title: '业务单号', dataIndex: 'outBizNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '备货单号', dataIndex: 'outBizSubNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库类型', dataIndex: 'outBizTypeDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'demanderName', width: '22%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         // { title: '仓库', dataIndex: 'warehouseName', width: '10%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
@@ -325,6 +332,7 @@ export default {
       this.queryParam.shippingAddrProvinceSn = undefined
       this.queryParam.sendFlag = undefined
       this.queryParam.warehouseSn = undefined
+      this.queryParam.outBizSubNo = ''
       this.queryParam.bizUserSn = undefined
 
       if (this.advanced) {

+ 27 - 19
src/views/salesManagement/outboundOrder/sendGoodModal.vue

@@ -140,19 +140,19 @@
             </template>
             <!-- 数量 -->
             <template slot="qty" slot-scope="text, record">
-              <a-input-number style="width: 100%;" :precision="0" v-model="record.goodsQty" :min="1" :max="999999"></a-input-number>
+              <a-input-number style="width: 100%;" :precision="0" v-model="record.goodsQty" :min="1" :max="99999999"></a-input-number>
             </template>
             <!-- 体积 -->
             <template slot="volume" slot-scope="text, record">
-              <a-input-number style="width: 100%;" :precision="2" v-model="record.goodsVolume" :min="0" :max="999999"></a-input-number>
+              <a-input-number style="width: 100%;" :precision="2" v-model="record.goodsVolume" :min="0" :max="99999999"></a-input-number>
             </template>
             <!-- 重量 -->
             <template slot="weight" slot-scope="text, record">
-              <a-input-number style="width: 100%;" :precision="2" v-model="record.goodsWeight" :min="0" :max="999999"></a-input-number>
+              <a-input-number style="width: 100%;" :precision="2" v-model="record.goodsWeight" :min="0" :max="99999999"></a-input-number>
             </template>
             <!-- 计费单价 -->
             <template slot="price" slot-scope="text, record">
-              <a-input-number style="width: 100%;" :precision="2" v-model="record.unitPrice" :min="0" :max="999999"></a-input-number>
+              <a-input-number style="width: 100%;" :precision="2" v-model="record.unitPrice" :min="0" :max="99999999"></a-input-number>
             </template>
             <!-- 运费 -->
             <template slot="freight" slot-scope="text, record">
@@ -162,11 +162,11 @@
                 @change="amountChange('transportAmount',record)"
                 v-model="record.transportAmount"
                 :min="0"
-                :max="999999"></a-input-number>
+                :max="99999999"></a-input-number>
             </template>
             <!-- 保价 -->
             <template slot="supportValue" slot-scope="text, record">
-              <a-input-number style="width: 100%;" :precision="2" v-model="record.supportValue" :min="0" :max="999999"></a-input-number>
+              <a-input-number style="width: 100%;" :precision="2" v-model="record.supportValue" :min="0" :max="99999999"></a-input-number>
             </template>
             <!-- 送货费 -->
             <template slot="deliveryExpense" slot-scope="text, record">
@@ -176,7 +176,7 @@
                 @change="amountChange('sendAmount',record)"
                 v-model="record.sendAmount"
                 :min="0"
-                :max="999999"></a-input-number>
+                :max="99999999"></a-input-number>
             </template>
             <!-- 其他 -->
             <template slot="other" slot-scope="text, record">
@@ -186,7 +186,7 @@
                 @change="amountChange('otherAmount',record)"
                 v-model="record.otherAmount"
                 :min="0"
-                :max="999999"></a-input-number>
+                :max="99999999"></a-input-number>
             </template>
             <!-- 操作 -->
             <template slot="action" slot-scope="text, record, index">
@@ -336,22 +336,30 @@ export default {
     },
     // 删除出库单
     delStockOutList (row) {
+      if (this.sendBillStockOutList && this.sendBillStockOutList.length == 1) {
+        this.$message.warning('发货单必须关联相关出库单号!')
+        return
+      }
       const ri = this.sendBillStockOutList.findIndex(item => row.stockOutSn == item.stockOutSn)
       // 新加的
-      if (row.id) {
+      if (ri > -1) {
         this.sendBillStockOutList.splice(ri, 1)
         this.getProductTotal()
-      } else {
-        // 删除后修改发货状态
-        this.spinning = true
-        deleteSendBillStockOut({ stockOutSn: row.stockOutSn, sendBillSn: this.form.sendBillSn }).then(res => {
-          if (res.status == 200) {
-            this.sendBillStockOutList.splice(ri, 1)
-            this.getProductTotal()
-          }
-          this.spinning = false
-        })
       }
+      // if (row.id) {
+      // this.sendBillStockOutList.splice(ri, 1)
+      // this.getProductTotal()
+      // } else {
+      //   // 删除后修改发货状态
+      //   this.spinning = true
+      //   deleteSendBillStockOut({ stockOutSn: row.stockOutSn, sendBillSn: this.form.sendBillSn }).then(res => {
+      //     if (res.status == 200) {
+      //       this.sendBillStockOutList.splice(ri, 1)
+      //       this.getProductTotal()
+      //     }
+      //     this.spinning = false
+      //   })
+      // }
     },
     // 编辑
     getDetail (data) {

+ 1 - 1
src/views/salesManagement/salesList/list.vue

@@ -130,7 +130,7 @@
                 <div v-if="record.sendOverDay*1>0">已超时{{ record.sendOverDay }}天(要求销售单允许打印后3天内发货)</div>
               </template>
               <div class="statusBox">
-                <a-icon type="exclamation-circle" :style="{color:'#ed1c24',fontSize:'20px',marginRight:'8px',display:'inlineBlock'}"/>
+                <a-icon type="exclamation-circle" theme="filled" :style="{color:'#ed1c24',fontSize:'18px',marginRight:'6px',display:'inlineBlock'}"/>
                 <span v-if="record.dispatchOverDay*1>0">未备货</span>
                 <span v-if="record.settleOverDay*1>0">未收款</span>
                 <span v-if="record.sendOverDay*1>0">未发货</span>

+ 1 - 1
src/views/salesManagement/salesQuery/chooseActive.vue

@@ -25,7 +25,7 @@
         <template slot="salesNums" slot-scope="text, record">
           <a-input-number
             size="small"
-            :max="999999"
+            :max="99999999"
             :min="1"
             v-model="record.qty"
             :precision="0"

+ 1 - 1
src/views/salesManagement/salesQuery/edit.vue

@@ -145,7 +145,7 @@
               v-model="record.qty"
               :precision="0"
               :min="1"
-              :max="999999"
+              :max="99999999"
               placeholder="请输入"
               @blur="e => onCellBlur(e.target.value, record)"
               style="width: 100%;" />

+ 1 - 1
src/views/salesManagement/salesQuery/queryPart.vue

@@ -71,7 +71,7 @@
             v-model="record.salesNums"
             :precision="0"
             :min="1"
-            :max="999999"
+            :max="99999999"
             style="width: 100%;"
             placeholder="请输入" />
         </div>

+ 1 - 1
src/views/salesManagement/salesQuery/queryPromotable.vue

@@ -18,7 +18,7 @@
         v-model="record.qty"
         :precision="0"
         :min="1"
-        :max="999999"
+        :max="99999999"
         placeholder="请输入"
         @blur="e => onCellBlur(e.target.value, record)"
         style="width: 100%;" />

+ 1 - 1
src/views/salesManagement/salesQueryNew/comps/activeQueryPart.vue

@@ -71,7 +71,7 @@
             v-model="record.salesNums"
             :precision="0"
             :min="1"
-            :max="999999"
+            :max="99999999"
             style="width: 100%;"
             placeholder="请输入" />
         </div>

+ 1 - 1
src/views/salesManagement/salesQueryNew/comps/productList.vue

@@ -186,7 +186,7 @@
           v-model="record.qty"
           :precision="0"
           :min="1"
-          :max="999999"
+          :max="99999999"
           placeholder="请输入"
           @blur="e => onCellBlur(e.target.value, record)"
           :style="{width:'100%',color:record.qty>=record.unitQtyR?'':'red'}" />

+ 1 - 1
src/views/salesManagement/salesQueryNew/comps/productNormalList.vue

@@ -120,7 +120,7 @@
           v-model="record.qty"
           :precision="0"
           :min="1"
-          :max="999999"
+          :max="99999999"
           placeholder="请输入"
           @blur="e => onCellBlur(e.target.value, record)"
           style="width: 100%;" />

+ 1 - 1
src/views/salesManagement/salesQueryNew/comps/queryPart.vue

@@ -68,7 +68,7 @@
             v-model="record.salesNums"
             :precision="0"
             :min="1"
-            :max="999999"
+            :max="99999999"
             style="width: 100%;"
             placeholder="请输入" />
         </div>

+ 62 - 13
src/views/salesManagement/salesQueryNew/list.vue

@@ -156,7 +156,17 @@
               </div>
             </div>
             <div>
-              <a-checkbox v-model="showCancelNum"><span style="display: inline-block;margin-top: 1px;">显示取消数量</span></a-checkbox>
+              <span>显示:</span>
+              <a-tree-select
+                size="small"
+                v-model="showCols"
+                style="min-width: 200px"
+                dropdownMatchSelectWidth
+                :maxTagCount="3"
+                :tree-data="colsArr"
+                tree-checkable
+                placeholder="请选择要显示的列(多选)"
+              />
             </div>
           </div>
         </div>
@@ -407,7 +417,6 @@ export default {
           return data
         })
       },
-      showCancelNum: false, //  是否显示取消数量和待下推数量
       tipData: null, // 备货单信息
       tempSalesBillSn: null,
       // 允许备货打印
@@ -425,6 +434,39 @@ export default {
           title: '备货打印状态',
           dataIndex: 'printStatusDictValue'
         }
+      ],
+      showCols: [], // 列表显示列
+      colsArr: [
+        {
+          title: '已取消数量',
+          value: 'totalCancelQty',
+          key: 'totalCancelQty',
+          disabled: false
+        },
+        {
+          title: '待下推数量',
+          value: 'totalUnpushedQty',
+          key: 'totalUnpushedQty',
+          disabled: false
+        },
+        {
+          title: '待下推金额',
+          value: 'totalUnpushedAmount',
+          key: 'totalUnpushedAmount',
+          disabled: !this.$hasPermissions('M_salesQueryList_salesPrice')
+        },
+        {
+          title: '转采购额数量',
+          value: 'totalConvertPromoGiftsQty',
+          key: 'totalConvertPromoGiftsQty',
+          disabled: false
+        },
+        {
+          title: '转采购额金额',
+          value: 'totalConvertPromoGiftsAmount',
+          key: 'totalConvertPromoGiftsAmount',
+          disabled: !this.$hasPermissions('M_salesQueryList_salesPrice')
+        }
       ]
     }
   },
@@ -438,8 +480,15 @@ export default {
         { title: '客户名称', dataIndex: 'buyerName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '出库仓库', scopedSlots: { customRender: 'warehouseBox' }, width: '8%', align: 'left', ellipsis: true },
         { title: '总数量', dataIndex: 'totalQty', scopedSlots: { customRender: 'totalQty' }, width: '4%', align: 'center' },
+        { title: '总售价', dataIndex: 'totalAmount', width: '4%', align: 'right',isShow:false,customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '已下推数量', dataIndex: 'totalPushedQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '下推总金额', dataIndex: 'totalPushedAmount', width: '4%', align: 'right', isShow:false, customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '待下推数量', dataIndex: 'totalUnpushedQty', width: '4%', align: 'center', isShow:false, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '待下推金额', dataIndex: 'totalUnpushedAmount', width: '4%', align: 'right',isShow:false,  customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '已发货数量', dataIndex: 'totalDispatchQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '已取消数量', dataIndex: 'totalCancelQty', width: '4%', align: 'center',isShow:false,  customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '转采购额数量', dataIndex: 'totalConvertPromoGiftsQty', width: '4%', align: 'center',isShow:false,  customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '转采购额金额', dataIndex: 'totalConvertPromoGiftsAmount', width: '4%', align: 'right',isShow:false,  customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '收款方式', dataIndex: 'settleStyleSnDictValue', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核时间', dataIndex: 'auditDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
         { title: '最近备货时间', dataIndex: 'lastStockUpDate', width: '6%', align: 'center', customRender: function (text) { return text || '--' }, sorter: true },
@@ -448,17 +497,17 @@ export default {
         { title: '备货打印状态', dataIndex: 'printStatusDictValue', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '7%', align: 'center' }
       ]
-
-      if (this.$hasPermissions('M_salesQueryList_salesPrice')) { // 售价权限
-        arr.splice(6, 0, { title: '总售价', dataIndex: 'totalAmount', width: '4%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(8, 0, { title: '下推总金额', dataIndex: 'totalPushedAmount', width: '4%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-      }
-      if (this.showCancelNum) {
-        const ind = this.$hasPermissions('M_salesQueryList_salesPrice') ? 10 : 8
-        arr.splice(ind, 0, { title: '已取消数量', dataIndex: 'totalCancelQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-        arr.splice(ind + 1, 0, { title: '待下推数量', dataIndex: 'totalUnpushedQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
-      }
-      return arr
+      
+      arr.map(item => {
+        if(this.$hasPermissions('M_salesQueryList_salesPrice')){
+          item.isShow = ['totalAmount','totalPushedAmount','totalUnpushedAmount','totalConvertPromoGiftsAmount'].includes(item.dataIndex)
+        }
+        if(this.colsArr.find(k=>k.value==item.dataIndex)){
+          item.isShow = this.showCols.includes(item.dataIndex)
+        }
+      })
+      console.log(arr)
+      return arr.filter(item => !this.colsArr.find(k=>k.value==item.dataIndex) || item.isShow)
     }
   },
   methods: {

+ 1 - 1
src/views/salesReturnManagement/billOfLading/add.vue

@@ -82,7 +82,7 @@
                   v-model="form.goodsNum"
                   :precision="0"
                   :min="1"
-                  :max="999999"
+                  :max="99999999"
                   placeholder="请输入件数"
                 />
               </a-form-model-item>

+ 2 - 2
src/views/salesReturnManagement/receiveCheck/receiving.vue

@@ -60,7 +60,7 @@
               v-model="record.initialQty"
               :precision="0"
               :min="0"
-              :max="999999"
+              :max="99999999"
               @blur="e => onCellBlurInitialQty(e.target.value, record)"
               placeholder="请输入"
               style="width: 100%;" />
@@ -73,7 +73,7 @@
               v-model="record.receiveQty"
               :precision="0"
               :min="0"
-              :max="999999"
+              :max="99999999"
               @blur="e => onCellBlurReceiveQty(e.target.value, record)"
               placeholder="请输入"
               style="width: 100%;" />

+ 35 - 12
src/views/salesReturnManagement/returnSchedule/list.vue

@@ -68,6 +68,8 @@
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="超时环节提醒">
                   <a-select v-model="queryParam.checkflag" allowClear placeholder="请选择超时环节提醒状态">
+                    <a-select-option value="unReturnLevel1">!未退货</a-select-option>
+                    <a-select-option value="unReturnLevel2">!!未退货</a-select-option>
                     <a-select-option value="oneouttime">!未清点</a-select-option>
                     <a-select-option value="twoouttime">!!未清点</a-select-option>
                   </a-select>
@@ -108,22 +110,43 @@
           bordered>
           <!-- 超时环节提示 -->
           <template slot="tip" slot-scope="text, record">
-            <a-tooltip placement="top" v-if="record.customerServiceConfirmOverDay && record.customerServiceConfirmOverDay*1>3">
-              <template slot="title">
-                <span>已超时{{ record.customerServiceConfirmOverDay }}天(要求提货后3-5天内完成清点)</span>
-              </template>
-              <div>
-                <a-icon type="exclamation-circle" :style="{color:'#ed1c24',fontSize:'20px',marginRight:'8px',display:'inlineBlock'}"/>
-                <a-icon v-if="record.customerServiceConfirmOverDay*1>5" type="exclamation-circle" :style="{color:'#ed1c24',fontSize:'20px',marginRight:'8px',display:'inlineBlock'}"/>
-                <span style="vertical-align: top;">未清点</span>
-              </div>
-            </a-tooltip>
-            <span v-else>--</span>
+            <div v-if="record.pickUpFirstAuditDateOverDay">
+              <a-tooltip placement="top" v-if="record.pickUpFirstAuditDateOverDay*1>3">
+                <template slot="title">
+                  <span>已超时{{ record.pickUpFirstAuditDateOverDay }}天(要求提货后3-5天内完成清点)</span>
+                </template>
+                <div>
+                  <a-icon type="exclamation-circle" theme="filled" :style="{color:'#ed1c24',fontSize:'18px',marginRight:'6px',display:'inlineBlock'}"/>
+                  <a-icon v-if="record.pickUpFirstAuditDateOverDay*1>5" theme="filled" type="exclamation-circle" :style="{color:'#ed1c24',fontSize:'18px',marginRight:'6px',display:'inlineBlock'}"/>
+                  <span style="vertical-align: top;">未清点</span>
+                </div>
+              </a-tooltip>
+              <span v-else>--</span>
+            </div>
+            <div v-if="!record.pickUpFirstAuditDateOverDay&&record.auditDateOverDay">
+              <a-tooltip placement="top" v-if="record.auditDateOverDay*1>=5">
+                <template slot="title">
+                  <span>已超时{{ record.auditDateOverDay }}天(要求销售退货单审核通过后5天内完成提货)</span>
+                </template>
+                <div>
+                  <a-icon type="exclamation-circle" theme="filled" :style="{color:'#ed1c24',fontSize:'18px',marginRight:'6px',display:'inlineBlock'}"/>
+                  <a-icon v-if="record.auditDateOverDay*1>10" theme="filled" type="exclamation-circle" :style="{color:'#ed1c24',fontSize:'18px',marginRight:'6px',display:'inlineBlock'}"/>
+                  <span style="vertical-align: top;">未退货</span>
+                </div>
+              </a-tooltip>
+              <span v-else>--</span>
+            </div>
+            <div v-if="!record.auditDateOverDay&&!record.pickUpFirstAuditDateOverDay">--</div>
           </template>
           <!-- 总部销退单号 -->
           <template slot="salesReturnBillNo" slot-scope="text, record">
             <span class="link-bule" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</span>
           </template>
+          <!-- 提货审核时间 -->
+          <template slot="pickUpAuditDate" slot-scope="text, record">
+            <span v-if="record.pickUpFlag==1">{{ record.pickUpAuditDate }}</span>
+            <span v-else>--</span>
+          </template>
         </s-table>
       </a-spin>
     </a-card>
@@ -220,7 +243,7 @@ export default {
         { title: '申请退货数量', dataIndex: 'totalInitialQty', width: '100px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '申请退货金额', dataIndex: 'initialAmount', width: '100px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
         { title: '退货申请审核时间', dataIndex: 'auditTime', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '提货审核时间', dataIndex: 'pickUpAuditDate', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '提货审核时间', dataIndex: 'pickUpAuditDate', width: '150px', align: 'center', scopedSlots: { customRender: 'pickUpAuditDate' } },
         { title: '收货时间', dataIndex: 'receiveTime', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '品检时间', dataIndex: 'checkTime', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客服确认时间', dataIndex: 'customerServiceConfirmTime', width: '150px', align: 'center', customRender: function (text) { return text || '--' } },

+ 2 - 2
src/views/salesReturnManagement/salesReturn/queryPart.vue

@@ -43,7 +43,7 @@
             v-model="record.qty"
             :precision="0"
             :min="showReceiveQty?0:1"
-            :max="999999"
+            :max="99999999"
             style="width: 100%;"
             placeholder="请输入" />
         </div>
@@ -56,7 +56,7 @@
             v-model="record.receiveQty"
             :precision="0"
             :min="1"
-            :max="999999"
+            :max="99999999"
             style="width: 100%;"
             placeholder="请输入" />
         </div>

+ 3 - 3
src/views/salesReturnManagement/salesReturn/salesReturnEdit.vue

@@ -106,7 +106,7 @@
               v-model="record.initialQty"
               :precision="0"
               :min="0"
-              :max="999999"
+              :max="99999999"
               placeholder="请输入"
               @blur="e => onCellBlur(e.target.value, record, 'qty')"
               style="width: 100%;" />
@@ -230,7 +230,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         // 查询总计
-        this.productForm.salesReturnBillSn = this.$route.params.sn
+        this.productForm.salesReturnBillSn = this.orderSn
         return salesReturnDetailList(Object.assign(parameter, this.productForm)).then(res => {
           let data
           if (res.status == 200) {
@@ -391,7 +391,7 @@ export default {
         })
         salesReturnDetailSetReason({
           salesReturnBillDetailSnList: snList,
-          salesReturnBillSn: this.$route.params.sn,
+          salesReturnBillSn: this.orderSn,
           returnReason: rows ? rows.dispName : '',
           returnReasonCode: this.plReturnReason,
           returnReasonRemarks: this.showEditRemarks ? this.plReturnRemark || '' : undefined

+ 1 - 1
src/views/supplierManagement/associatedProduct/settingCost.vue

@@ -29,7 +29,7 @@
               v-model="form.cost"
               :precision="2"
               :min="0"
-              :max="999999"
+              :max="99999999"
               placeholder="请输入"
               ref="cost"
               @keyup.enter.native="onSubmit"

+ 1 - 1
src/views/supplierManagement/costSetting/settingCost.vue

@@ -35,7 +35,7 @@
               v-model="form.modifyCost"
               :precision="2"
               :min="0"
-              :max="999999"
+              :max="99999999"
               placeholder="请输入"
               ref="modifyCost"
               @keyup.enter.native="onSubmit"

+ 4 - 4
src/views/supplierManagement/supplierInfo/edit.vue

@@ -94,7 +94,7 @@
                       v-model="form.produceCycle"
                       :precision="0"
                       :min="1"
-                      :max="999999"
+                      :max="99999999"
                       placeholder="请输入"
                       style="width: 100%;" />
                   </a-form-model-item>
@@ -106,7 +106,7 @@
                       v-model="form.deliveryCycle"
                       :precision="0"
                       :min="1"
-                      :max="999999"
+                      :max="99999999"
                       placeholder="请输入"
                       style="width: 100%;" />
                   </a-form-model-item>
@@ -118,7 +118,7 @@
                       v-model="form.settleCycle"
                       :precision="0"
                       :min="1"
-                      :max="999999"
+                      :max="99999999"
                       placeholder="请输入"
                       style="width: 100%;" />
                   </a-form-model-item>
@@ -165,7 +165,7 @@
                       v-model="form.busniessScope"
                       :precision="0"
                       :min="1"
-                      :max="999999"
+                      :max="99999999"
                       placeholder="请输入"
                       style="width: 100%;" />
                   </a-form-model-item>