Browse Source

bug修复

chenrui 4 years ago
parent
commit
1485fcf1e0

+ 1 - 1
src/config/router.config.js

@@ -788,7 +788,7 @@ export const asyncRouterMap = [
                 }
               },
               {
-                path: 'detail/:sn',
+                path: 'detail/:sn/:type',
                 name: 'pushOrderDetail',
                 component: () => import(/* webpackChunkName: "salesManagement" */ '@/views/salesManagement/pushOrderManagement/detail.vue'),
                 meta: {

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

@@ -244,7 +244,7 @@ export default {
     },
     //  详情
     handleDetail (row) {
-      this.$router.push({ name: 'pushOrderDetail', params: { sn: row.dispatchBillSn } })
+      this.$router.push({ name: 'pushOrderDetail', params: { sn: row.dispatchBillSn, type: 'pushOrder' } })
     }
   }
 }

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

@@ -208,7 +208,7 @@ export default {
     handleDetail (row) {
       //  根据出库类型跳转对应页面
       if (row.outBizType == 'SALES') { //  销售出库
-        this.$router.push({ path: `/salesManagement/pushOrderManagement/detail/${row.outBizSubSn}` })
+        this.$router.push({ path: `/salesManagement/pushOrderManagement/detail/${row.outBizSubSn}/stockOut` })
       } else if (row.outBizType == 'ALLOCATE') { //  调拨出库
         this.$router.push({ path: `/allocationManagement/transferOut/detail/${row.outBizSn}` })
       } else if (row.outBizType == 'CHECK_ORDER_OUT') { //  库存盘点盘亏

+ 13 - 4
src/views/salesManagement/pushOrderManagement/detail.vue

@@ -28,7 +28,8 @@
       <!-- alert -->
       <a-alert type="info" style="margin-bottom: 10px;" v-if="detailData!=null">
         <div slot="message">
-          总销售数量:<strong>{{ detailData.totalSalesQty || 0 }}</strong>;本次下推数量:<strong>{{ detailData.totalQty || 0 }}</strong>;
+          <span v-if="$route.params.type!='stockOut'">总销售数量:<strong>{{ detailData.totalSalesQty || 0 }}</strong>;</span>
+          本次下推数量:<strong>{{ detailData.totalQty || 0 }}</strong>;
           </strong></strong></div>
       </a-alert>
       <!-- 列表 -->
@@ -37,7 +38,7 @@
         ref="table"
         size="default"
         :rowKey="(record) => record.id"
-        :columns="columns"
+        :columns="$route.params.type=='stockOut' ? outColumns : columns"
         :data="loadData"
         :scroll="{ x: 1070, y: 500 }"
         bordered>
@@ -69,8 +70,16 @@ export default {
         { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'productOrigCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '单位', dataIndex: 'productOrigUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '销售数量', dataIndex: 'salesQty', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '本次下推数', dataIndex: 'qty', width: 130, align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '销售数量', dataIndex: 'salesQty', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '本次下推数', dataIndex: 'qty', width: 130, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+      ],
+      outColumns: [
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center' },
+        { title: '产品编码', dataIndex: 'productCode', width: 220, scopedSlots: { customRender: 'productCode' }, align: 'center' },
+        { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '原厂编码', dataIndex: 'productOrigCode', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单位', dataIndex: 'productOrigUnit', width: 100, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '本次出库数', dataIndex: 'qty', width: 130, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 5 - 1
src/views/salesManagement/pushOrderManagement/list.vue

@@ -169,7 +169,11 @@ export default {
     },
     // 详情
     handleDetail (row, type) {
-      this.$router.push({ name: type == 0 ? 'salesDetail' : 'pushOrderDetail', params: { sn: type == 0 ? row.salesBillSn : row.dispatchBillSn } })
+      if (type == 0) {
+        this.$router.push({ name: 'salesDetail', params: { sn: row.salesBillSn } })
+      } else {
+        this.$router.push({ name: 'pushOrderDetail', params: { sn: row.dispatchBillSn, type: 'pushOrder' } })
+      }
     },
     // 重置
     resetSearchForm () {

+ 7 - 7
src/views/salesManagement/salesReturn/list.vue

@@ -53,7 +53,7 @@
                   allowClear></v-select>
               </a-form-item>
             </a-col>
-            <a-col :md="6" :sm="24">
+            <!-- <a-col :md="6" :sm="24">
               <a-form-item label="财务状态">
                 <v-select
                   v-model="queryParam.financialStatus"
@@ -63,7 +63,7 @@
                   placeholder="请选择财务状态"
                   allowClear></v-select>
               </a-form-item>
-            </a-col>
+            </a-col> -->
           </template>
           <a-col :md="6" :sm="24">
             <span class="table-page-search-submitButtons">
@@ -105,9 +105,9 @@
         <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.salesReturnBillNo }}</span>
       </template>
       <!-- 财务状态 -->
-      <template slot="financialStatus" slot-scope="text, record">
+      <!-- <template slot="financialStatus" slot-scope="text, record">
         <a-badge :color="text=='FINISH'?'#87d068':'gold'" :text="record.financialStatusDictValue" />
-      </template>
+      </template> -->
       <!-- 操作 -->
       <template slot="action" slot-scope="text, record">
         <a-button
@@ -190,7 +190,7 @@ export default {
         salesReturnBillNo: undefined, //  总部销退单号
         purchaseReturnBillNo: '',
         billStatus: undefined, // 业务状态
-        financialStatus: undefined, // 财务状态
+        // financialStatus: undefined, // 财务状态
         beginDate: undefined,
         endDate: undefined,
         beginAuditDate: undefined,
@@ -212,7 +212,7 @@ export default {
         { title: '是否抓单', dataIndex: 'grabFlag', width: 100, align: 'center', customRender: function (text) { return ['否', '是'][text] } },
         { title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '业务状态', dataIndex: 'billStatusDictValue', width: 110, align: 'center' },
-        { title: '财务状态', dataIndex: 'financialStatusDictValue', scopedSlots: { customRender: 'financialStatus' }, width: 110, align: 'center' },
+        // { title: '财务状态', dataIndex: 'financialStatusDictValue', scopedSlots: { customRender: 'financialStatus' }, width: 110, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 180, align: 'center', fixed: 'right' }
       ],
       // 加载数据方法 必须为 Promise 对象
@@ -332,7 +332,7 @@ export default {
       this.queryParam.salesReturnBillNo = ''
       this.queryParam.purchaseReturnBillNo = ''
       this.queryParam.billStatus = undefined
-      this.queryParam.financialStatus = undefined
+      // this.queryParam.financialStatus = undefined
       this.queryParam.beginDate = undefined
       this.endDate = undefined
       this.beginAuditDate = undefined