lilei 2 years ago
parent
commit
57bcca0391

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1674012487353
+  "version": 1674014520076
 }

+ 24 - 27
src/views/reportData/urgentItemsOffsetReport/list.vue

@@ -40,7 +40,7 @@
                 ref="status"
                 id="urgentItemsOffsetReport-biztype"
                 code="URGENT_BIZ_TYPE"
-                placeholder="请选择状态"
+                placeholder="急件类型"
                 allowClear></v-select>
             </a-form-item>
           </a-col>
@@ -64,14 +64,9 @@
     <a-alert type="info" style="margin-bottom:10px">
       <div class="ftext" slot="message">
         总单数:<strong>{{ (totalData && (totalData.totalCategory || totalData.totalCategory==0)) ? totalData.totalCategory : '--' }}</strong>;
-        总退货数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
-        废品数量:<strong>{{ (totalData && (totalData.totalCelQty || totalData.totalCelQty==0)) ? totalData.totalCelQty : '--' }}</strong>;
-        入库数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
-        退货金额:<strong>{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? '¥'+totalData.totalAmount : '--' }}</strong>;
-        折扣金额:<strong>{{ (totalData && (totalData.discountAmount || totalData.discountAmount==0)) ? '¥'+totalData.discountAmount : '--' }}</strong>;
-        折后退货金额:<strong>{{ (totalData && (totalData.discountedAmount || totalData.discountedAmount==0)) ? '¥'+totalData.discountedAmount : '--' }}</strong>;
+        产品总数量:<strong>{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</strong>;
         <div v-if="$hasPermissions('M_ShowAllCost')" style="display: inline-block;">
-          退货成本:<strong>{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? '¥'+totalData.totalCost : '--' }}</strong>。
+          冲减总成本:<strong>{{ (totalData && (totalData.totalCost || totalData.totalCost==0)) ? '¥'+totalData.totalCost : '--' }}</strong>。
         </div>
       </div>
     </a-alert>
@@ -110,10 +105,12 @@ export default {
         beginDate: '',
         endDate: '',
         buyerName: '',
-        salesReturnNo: ''
+        bizBillNo: '',
+        urgentBillNo: '',
+        bizType: undefined
       },
       rules: {
-        'time': [{ required: true, message: '请选择审核时间', trigger: 'change' }]
+        'time': [{ required: true, message: '请选择冲减时间', trigger: 'change' }]
       },
       disabled: false, //  查询、重置按钮是否可操作
       exportLoading: false,
@@ -132,7 +129,6 @@ export default {
             const no = (data.pageNo - 1) * data.pageSize
             for (var i = 0; i < data.list.length; i++) {
               data.list[i].no = no + i + 1
-              data.list[i].inStockQty = data.list[i].totalQty
             }
             this.disabled = false
           }
@@ -147,20 +143,17 @@ export default {
     columns () {
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '销售退货单号', dataIndex: 'salesReturnNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '急件单号', dataIndex: 'urgentBillNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '急件类型', dataIndex: 'bizTypeDictValue', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '销售单号', dataIndex: 'bizBillNo', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'buyerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '款数', dataIndex: 'totalCategory', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '总退货数量', dataIndex: 'totalQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '废品数量', dataIndex: 'totalCelQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '入库数量', dataIndex: 'inStockQty', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '退货金额', dataIndex: 'totalAmount', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '折扣金额', dataIndex: 'discountAmount', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '折后退货金额', dataIndex: 'discountedAmount', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '退货成本', dataIndex: 'totalCost', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '审核时间', dataIndex: 'auditTime', width: '13%', align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '款数', dataIndex: 'totalCategory', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '数量', dataIndex: 'totalQty', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        // { title: '成本', dataIndex: 'totalCost', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '冲减时间', dataIndex: 'offSetTime', width: '12%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       if (this.$hasPermissions('M_ShowAllCost')) {
-        arr.splice(10, 0, { title: '退货成本', dataIndex: 'totalCost', width: '7%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
+        arr.splice(7, 0, { title: '成本', dataIndex: 'totalCost', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } })
       }
       return arr
     }
@@ -195,12 +188,16 @@ export default {
     },
     //  重置
     resetSearchForm () {
+      this.queryParam = {
+        time: [],
+        beginDate: '',
+        endDate: '',
+        buyerName: '',
+        bizBillNo: '',
+        urgentBillNo: '',
+        bizType: undefined
+      }
       this.$refs.rangeDate.resetDate()
-      this.queryParam.time = []
-      this.queryParam.beginDate = ''
-      this.queryParam.endDate = ''
-      this.queryParam.salesReturnNo = ''
-      this.queryParam.buyerName = ''
       this.$refs.ruleForm.resetFields()
       this.totalData = null
       this.$refs.table.clearTable()

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

@@ -33,7 +33,7 @@
                     ref="status"
                     id="chainTransferInList-biztype"
                     code="URGENT_BIZ_TYPE"
-                    placeholder="请选择状态"
+                    placeholder="请选择急件类型"
                     allowClear></v-select>
                 </a-form-item>
               </a-col>