Bladeren bron

修改bug

chenrui 1 jaar geleden
bovenliggende
commit
32c4db8bfe

+ 8 - 0
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_ProductPriceExoprt')"
+                id="productInfoList-export">导出</a-button>
               <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
                 <a-icon :type="advanced ? 'up' : 'down'"/>

+ 2 - 2
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="isShow = false" style="margin-right: 15px;">审核不通过</a-button>
+          <a-button type="primary" class="button-info" id="productPricingAudit-save" @click="handleAudit">审核通过</a-button>
         </div>
       </div>
     </a-spin>

+ 55 - 22
src/views/productManagement/productPricing/list.vue

@@ -130,9 +130,39 @@
       <!-- 编辑价格 -->
       <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="closeAuditModal"
+            style="margin-right: 15px;">审核不通过</a-button>
+          <a-button
+            type="primary"
+            id="auditModal-save"
+             class="button-info"
+            :loading="loadingAudit"
+            @click="handleAuditModal"
+          >审核通过</a-button>
+        </div>
+      </a-modal>
     </a-card>
   </div>
 </template>
@@ -194,6 +224,7 @@ export default {
       total: 0, // 合计
       openModal: false, //  编辑  弹框
       openAuditModal: false, //  审核  弹框
+      openPriceAuditModal:false,
       itemSn: '', //  当前产品sn
       rowSelectionInfo: null
     }
@@ -261,7 +292,7 @@ export default {
     // 审核
     handleAudit (row) {
       this.itemSn = row.productSn
-      this.openAuditModal = true
+      this.openPriceAuditModal = true
     },
     auditSuccess () {
       this.$refs.table.clearSelected() // 清空表格选中项
@@ -278,25 +309,7 @@ export default {
       _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 +341,7 @@ export default {
     //  关闭审核弹框
     closeAuditModal () {
       this.itemSn = ''
-      this.openAuditModal = false
+      this.openPriceAuditModal = false
     },
     //  产品分类  change
     changeProductType (val, opt) {
@@ -345,6 +358,26 @@ export default {
     setTableH () {
       const tableSearchH = this.$refs.tableSearch.offsetHeight
       this.tableHeight = window.innerHeight - tableSearchH - 240
+    },
+    // 批量审核----->审核不通过
+    closeAuditModal(){
+      
+    },
+    //批量审核----->审核通过
+    handleAuditModal(){
+      let _this=this
+      _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
+          _this.openAuditModal=false
+        } else {
+          _this.spinning = false
+        }
+      })
     }
   },
   watch: {

+ 16 - 4
src/views/purchasingManagement/purchaseReturn/addModal.vue

@@ -37,6 +37,16 @@
             placeholder="请选择退货仓库"
           />
         </a-form-model-item>
+        <a-form-model-item label="是否抓单" prop="isGrab">
+          <a-radio-group v-model="form.isGrab">
+            <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: '',
+        isGrab: undefined
       },
       attachList: [], // 附件
       rules: {
@@ -112,6 +123,7 @@ export default {
           { required: true, message: '请选择退货原因', trigger: 'change' }
         ],
         warehouseSn: [{ required: true, message: '请选择退货仓库', trigger: 'change' }],
+        isGrab: [{ required: true, message: '请选择是否抓单', trigger: 'change' }]
       },
       attachAction: process.env.VUE_APP_API_BASE_URL + '/uploadGetFileInfo'
     }
@@ -190,9 +202,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 +221,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;
     }
   }

+ 22 - 21
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="是否抓单">否</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">
@@ -108,7 +109,7 @@ export default {
     columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '7%', align: 'center' },
-        { title: '入库单号', dataIndex: 'sparePartsNo', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '关联单号', dataIndex: 'sparePartsNo', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品编码', dataIndex: 'productCode', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'product.name', width: '30%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '单位', dataIndex: 'product.unit', width: '14%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -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)
         })
       }

+ 25 - 24
src/views/purchasingManagement/purchaseReturn/purchaseReturnDeatil.vue

@@ -22,27 +22,28 @@
             <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="是否抓单">否</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>
@@ -61,7 +62,7 @@
             <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="入库单号"><a-input v-model.trim="productForm.sparePartsNo" allowClear placeholder="请输入入库单号" /></a-form-item>
+                  <a-form-item label="关联单号"><a-input v-model.trim="productForm.sparePartsNo" allowClear placeholder="请输入关联单号" /></a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="产品编码"><a-input v-model.trim="productForm.productCode" allowClear placeholder="请输入产品编码" /></a-form-item>
@@ -202,7 +203,7 @@ export default {
       const arr = [
         { title: '序号', dataIndex: 'no', align: 'center', width: '4%' },
         {
-          title: '入库单号',
+          title: '关联单号',
           dataIndex: 'sparePartsNo',
           width: '18%',
           align: 'center',
@@ -465,7 +466,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)
     },
     // 获取页面统计数据
     getStatisticsData () {

+ 3 - 3
src/views/purchasingManagement/purchaseReturn/queryPart.vue

@@ -6,8 +6,8 @@
         <a-form layout="inline" @keyup.enter.native="$refs.chooseTable.refresh(true)">
           <a-row :gutter="15">
             <a-col :md="5" :sm="24">
-              <a-form-item label="入库单号">
-                <a-input id="salesReturnList-productCode" v-model.trim="queryParam.sparePartsNo" allowClear placeholder="请输入入库单号"/>
+              <a-form-item label="关联单号">
+                <a-input id="salesReturnList-productCode" v-model.trim="queryParam.sparePartsNo" allowClear placeholder="请输入关联单号"/>
               </a-form-item>
             </a-col>
             <a-col :md="5" :sm="24">
@@ -152,7 +152,7 @@ export default {
     columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
-        { title: '入库单号', dataIndex: 'sparePartsNo', width: '24%', align: 'center', customRender: function (text) { return text || '--' } },
+        { 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.unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },

+ 25 - 6
src/views/reportData/salesDetails/list.vue

@@ -53,12 +53,12 @@
                   allowClear></v-select>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+              <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">
-                <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>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="产品品牌">
                   <ProductBrand id="salesDetailsList-productBrandSn" :brandType="queryParam.productBrandTypeSn" v-model="queryParam.productBrandSn"></ProductBrand>
@@ -101,8 +101,19 @@
                   </a-select>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="产品类型" prop="goodFlag">
+                  <v-select
+                    v-model="queryParam.goodFlag"
+                    ref=" goodFlag"
+                    id="returnSchedule-goodFlag"
+                    code="GOOD_FLAG"
+                    placeholder="请选择产品类型"
+                    allowClear></v-select>
+                </a-form-model-item>
+              </a-col>
             </template>
-            <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
+            <a-col :md="24" :sm="24" style="margin-bottom: 10px;text-align:center;">
               <!-- <a-button
                 type="primary"
                 class="button-info"
@@ -145,6 +156,14 @@
           :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>
+            <a-badge count="缺" v-if="Number(record.stockQty||0) < Number(record.unpushedQty||0)" :number-style="{ 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>

+ 40 - 2
src/views/salesManagement/salesQueryNew/list.vue

@@ -150,8 +150,21 @@
                 已发货金额:<strong>{{ totalData&&(totalData.totalDispatchAmount || totalData.totalDispatchAmount==0) ? toThousands(totalData.totalDispatchAmount) : '--' }}</strong>;
               </div>
             </div>
-            <div>
+            <!-- <div>
               <a-checkbox v-model="showCancelNum"><span style="display: inline-block;margin-top: 1px;">显示取消数量</span></a-checkbox>
+            </div> -->
+            <div>
+              <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>
@@ -418,6 +431,24 @@ export default {
           title: '备货打印状态',
           dataIndex: 'printStatusDictValue'
         }
+      ],
+      showCols: [], // 列表显示列
+      colsArr: [
+        {
+          title: '取消数量',
+          value: 'salesBillNo',
+          key: 'salesBillNo'
+        },
+        {
+          title: '待下推金额',
+          value: 'warehouseName',
+          key: 'warehouseName'
+        },
+        {
+          title: '转采购额数量',
+          value: 'billStatusDictValue',
+          key: 'billStatusDictValue'
+        }
       ]
     }
   },
@@ -445,12 +476,19 @@ export default {
       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) : '--') } })
+        arr.splice(8, 0, { title: '待下推金额', dataIndex: 'totalPushedAmount', width: '4%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
-      if (this.showCancelNum) {
+
+      if (this.showCols.includes('salesBillNo') && 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 : '--') } })
+      }
+
+      if (this.showCancelNum) {
+        const ind = this.$hasPermissions('M_salesQueryList_salesPrice') ? 10 : 8
         arr.splice(ind + 1, 0, { title: '待下推数量', dataIndex: 'totalUnpushedQty', width: '4%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       }
+
       return arr
     }
   },

+ 5 - 3
src/views/salesReturnManagement/returnSchedule/list.vue

@@ -68,7 +68,9 @@
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="超时环节提醒">
                   <a-select v-model="queryParam.checkflag" allowClear placeholder="请选择超时环节提醒状态">
-                    <a-select-option value="oneouttime">!未清点</a-select-option>
+                    <a-select-option value="oneouttime">!未退货</a-select-option>
+                    <a-select-option value="twoouttime">!!未退货</a-select-option>
+                    <a-select-option value="twoouttime">!未清点</a-select-option>
                     <a-select-option value="twoouttime">!!未清点</a-select-option>
                   </a-select>
                 </a-form-model-item>
@@ -108,8 +110,8 @@
                 <span>已超时{{ record.customerServiceConfirmOverDay }}天(要求提货后3-5天内完成清点)</span>
               </template>
               <div>
-                <a-icon type="exclamation-circle" theme="filled" :style="{color:'#ed1c24',fontSize:'16px',marginRight:'6px',display:'inlineBlock'}"/>
-                <a-icon v-if="record.customerServiceConfirmOverDay*1>5" theme="filled" type="exclamation-circle" :style="{color:'#ed1c24',fontSize:'16px',marginRight:'6px',display:'inlineBlock'}"/>
+                <a-icon type="exclamation-circle" theme="filled" :style="{color:'#ed1c24',fontSize:'17px',marginRight:'6px',display:'inlineBlock'}"/>
+                <a-icon v-if="record.customerServiceConfirmOverDay*1>5" theme="filled" type="exclamation-circle" :style="{color:'#ed1c24',fontSize:'17px',marginRight:'6px',display:'inlineBlock'}"/>
                 <span style="vertical-align: top;">未清点</span>
               </div>
             </a-tooltip>