chenrui 2 år sedan
förälder
incheckning
b81ee8e575

+ 22 - 22
src/views/numsGoodsShelves/customerAnalysis/list.vue

@@ -15,7 +15,7 @@
                   <rangeDate ref="orderDate" :value="orderTime" @change="orderDateChange" />
                 </a-form-item>
               </a-col>
-              <a-col :md="6" :sm="24">
+              <!-- <a-col :md="6" :sm="24">
                 <a-form-item label="货架取货数量">
                   <a-input-group compact>
                     <a-input-number
@@ -64,7 +64,7 @@
                     </a-input-group>
                   </a-form-item>
                 </a-col>
-              </template>
+              </template> -->
               <a-col :md="6" :sm="24" style="margin-bottom: 10px;">
                 <a-button type="primary" @click="$refs.table.refresh(true)" id="userd-refresh">查询</a-button>
                 <a-button type="" @click="reset" style="margin-left: 10px;" id="userd-reset">重置</a-button>
@@ -147,13 +147,13 @@ export default {
       orderTime: [],
       // 查询参数
       queryParam: {
-        providerSn: '',
+        providerSn: undefined,
         beginDate: '',
-        endDate: '',
-        qhslMin: undefined,
-        qhslMax: undefined,
-        xsslMin: undefined,
-        xsslMax: undefined
+        endDate: ''
+        // qhslMin: undefined,
+        // qhslMax: undefined,
+        // xsslMin: undefined,
+        // xsslMax: undefined
       },
       exportLoading: false,
       showModal: false,
@@ -167,29 +167,29 @@ export default {
         {
           slots: { title: 'customTitle' },
           children: [
-            { title: '铺货数量', dataIndex: 'totalShelfMaxQty', width: '8%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' }, sorter: true },
-            { title: '铺货金额', dataIndex: 'totalShelfMaxCost', width: '8%', align: 'center', customRender: function (text) { return text && toThousands(text, 2) || '--' }, sorter: true }
+            { title: '铺货数量', dataIndex: 'totalShelfMaxQty', width: '8%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
+            { title: '铺货金额', dataIndex: 'totalShelfMaxCost', width: '8%', align: 'center', customRender: function (text) { return (text || text == 0) ? toThousands(text, 2) : '--' } }
           ]
         },
         {
           title: '货架订单',
           children: [
-            { title: '取货数量', dataIndex: 'totalOrderQty', width: '8%', align: 'center', customRender: function (text) { return text && toThousands(text, 2) || '--' }, sorter: true },
-            { title: '取货金额', dataIndex: 'totalOrderAmount', width: '8%', align: 'center', customRender: function (text) { return text && toThousands(text, 2) || '--' }, sorter: true }
+            { title: '取货数量', dataIndex: 'totalOrderQty', width: '8%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
+            { title: '取货金额', dataIndex: 'totalOrderAmount', width: '8%', align: 'center', customRender: function (text) { return (text || text == 0) ? toThousands(text, 2) : '--' } }
           ]
         },
         {
           title: '急送订单',
           children: [
-            { title: '急送数量', dataIndex: 'tempOrderQty', width: '8%', align: 'center', customRender: function (text) { return text && toThousands(text, 2) || '--' }, sorter: true },
-            { title: '急送金额', dataIndex: 'tempOrderAmount', width: '8%', align: 'center', customRender: function (text) { return text && toThousands(text, 2) || '--' }, sorter: true }
+            { title: '急送数量', dataIndex: 'tempOrderQty', width: '8%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
+            { title: '急送金额', dataIndex: 'tempOrderAmount', width: '8%', align: 'center', customRender: function (text) { return (text || text == 0) ? toThousands(text, 2) : '--' } }
           ]
         },
         {
           title: '销售单',
           children: [
-            { title: '销售数量', dataIndex: 'saleOrderQty', width: '8%', align: 'center', customRender: function (text) { return text && toThousands(text, 2) || '--' }, sorter: true },
-            { title: '销售金额', dataIndex: 'saleOrderAmount', width: '8%', align: 'center', customRender: function (text) { return text && toThousands(text, 2) || '--' }, sorter: true }
+            { title: '销售数量', dataIndex: 'saleOrderQty', width: '8%', align: 'center', customRender: function (text) { return (text || text == 0) ? text : '--' } },
+            { title: '销售金额', dataIndex: 'saleOrderAmount', width: '8%', align: 'center', customRender: function (text) { return (text || text == 0) ? toThousands(text, 2) : '--' } }
           ]
         }
       ],
@@ -228,13 +228,13 @@ export default {
     // 重置
     reset () {
       this.queryParam = {
-        providerSn: '',
+        providerSn: undefined,
         beginDate: '',
-        endDate: '',
-        qhslMin: undefined,
-        qhslMax: undefined,
-        xsslMin: undefined,
-        xsslMax: undefined
+        endDate: ''
+        // qhslMin: undefined,
+        // qhslMax: undefined,
+        // xsslMin: undefined,
+        // xsslMax: undefined
       }
       this.$refs.orderDate.resetDate()
       this.$refs.table.refresh(true)

+ 4 - 4
src/views/numsGoodsShelves/vinAnalysis/spList.vue

@@ -116,7 +116,7 @@ export default {
       queryParam: { //  查询条件
         beginDate: '',
         endDate: '',
-        shelfSn: '',
+        shelfSn: undefined,
         productCode: undefined, //  产品编码
         productName: undefined, //  产品名称
         origCode: undefined, // 原厂编码
@@ -185,8 +185,8 @@ export default {
     //  创建时间  change
     dateChange (date) {
       this.time = date
-      this.queryParam.beginDate = date[0] || ''
-      this.queryParam.endDate = date[1] || ''
+      this.queryParam.beginDate = date[0]
+      this.queryParam.endDate = date[1]
     },
     //  查询
     handleSearch () {
@@ -204,7 +204,7 @@ export default {
       this.queryParam = {
         beginDate: '',
         endDate: '',
-        shelfSn: '',
+        shelfSn: undefined,
         productCode: undefined, //  产品编码
         productName: undefined, //  产品名称
         origCode: undefined, // 原厂编码